diff --git a/Gemfile b/Gemfile
index e9309130135473..dbadd53bb01ae9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -83,7 +83,7 @@ gem 'rails-settings-cached', '~> 0.6'
 gem 'redis', '~> 4.5', require: ['redis', 'redis/connection/hiredis']
 gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
 gem 'rqrcode', '~> 2.1'
-gem 'ruby-progressbar', '~> 1.11'
+gem 'ruby-progressbar', '~> 1.13'
 gem 'sanitize', '~> 6.0'
 gem 'scenic', '~> 1.6'
 gem 'sidekiq', '~> 6.5'
diff --git a/Gemfile.lock b/Gemfile.lock
index ecaa6f29ada036..6199eb3c9d7ea0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -631,7 +631,7 @@ GEM
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
-    ruby-progressbar (1.11.0)
+    ruby-progressbar (1.13.0)
     ruby-saml (1.13.0)
       nokogiri (>= 1.10.5)
       rexml
@@ -879,7 +879,7 @@ DEPENDENCIES
   rspec_junit_formatter (~> 0.5)
   rubocop (~> 1.30)
   rubocop-rails (~> 2.15)
-  ruby-progressbar (~> 1.11)
+  ruby-progressbar (~> 1.13)
   rucaptcha!
   sanitize (~> 6.0)
   scenic (~> 1.6)
diff --git a/README.md b/README.md
index 677a969c65f193..2b6f25345af221 100644
--- a/README.md
+++ b/README.md
@@ -87,6 +87,10 @@ The Docker images are listed [here](https://hub.docker.com/r/mashirozx/mastodon/
     </tr>
 </table>
 
+## Some Notes and Further Plan
+
+Since there are a lot of changes in v4 of upstream, I'm still working on merging it, see `dev` branch. But for the benefit of a long turn maintenance, I'm planing remove some less important features form this fork to reduce the work  I have to do every time when merge the code. I'm also considering switching to another web front end, like [elk](https://elk.zone), because the official web interface is really not in my favour :(
+
 ## Finally
 
 Thanks for the support of [JetBrains](https://jb.gg/OpenSourceSupport).
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index 33d971c341a42a..24dd3b3be79a62 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -26,7 +26,7 @@ def host_to_url(str)
   p.frame_ancestors :none
   p.font_src        :self, assets_host, google_fonts_host, iconfont_host
   p.img_src         :self, :https, :data, :blob, assets_host, analytics_host
-  p.style_src       :self, assets_host, google_fonts_host, iconfont_host
+  p.style_src       :self, :unsafe_inline, assets_host, google_fonts_host, iconfont_host
   p.media_src       :self, :https, :data, assets_host
   p.frame_src       :self, :https
   p.manifest_src    :self, assets_host
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 765eef8a861f5e..9ac2751ab1522e 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -21,7 +21,7 @@ def flags
     end
 
     def suffix
-      '~hello'
+      ''
     end
 
     def to_a