Merge dev

author: Allan Wang <me@allanwang.ca> 2019-04-21 20:22:11 -0400
committer: Allan Wang <me@allanwang.ca> 2019-04-21 20:22:11 -0400
commit: bbafb7b65ce655c1fdda8badd3098d2a0e1f7f08 (patch)
tree: 354b0bb6f021af54d1e3586e3e9bda064ad4ef02
parent: e5eb928feacba8d1c634ad8e5d85259ae161cabd (diff)
parent: f0f95295bdb2b853aa6262ec4bed2353ce326eee (diff)
download: frost-bbafb7b65ce655c1fdda8badd3098d2a0e1f7f08.tar.gz
frost-bbafb7b65ce655c1fdda8badd3098d2a0e1f7f08.tar.bz2
frost-bbafb7b65ce655c1fdda8badd3098d2a0e1f7f08.zip
120 files changed, 727 insertions, 474 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..1642d528
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,23 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug, unverified
+assignees: AllanWang
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behaviour:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Details (please provide at least the app version):**
+ - App Version:
+ - Device: 
+ - Android Version:
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 00000000..ceb35384
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,12 @@
+---
+name: Feature Request
+about: Propose a new feature
+title: ''
+labels: feature request
+assignees: AllanWang
+
+---
+
+**Describe the feature**
+<!-- Note that Frost is limited by Facebook's mobile site -->
+<!-- Features relating to the web content are not always possible -->
diff --git a/.github/ISSUE_TEMPLATE/theme-report.md b/.github/ISSUE_TEMPLATE/theme-report.md
new file mode 100644
index 00000000..820fb3f1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/theme-report.md
@@ -0,0 +1,16 @@
+---
+name: Theme report
+about: Problem with Frost's Theme
+title: ''
+labels: CSS
+assignees: AllanWang
+
+---
+
+**Description**
+<!-- Please describe the theme error, and how to get to the page-->
+
+**Details (please provide at least the app version):**
+ - App Version:
+ - Device: 
+ - Android Version:
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
index 64580d14..30d5fbc6 100644
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -3,4 +3,4 @@
     <option name="PROJECT_PROFILE" value="ktlint" />
     <version value="1.0" />
   </settings>
-</component>
+</component>
+\ No newline at end of file
diff --git a/README.md b/README.md
index fbdc7bb2..30191f8f 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # Frost-for-Facebook
 
+[![Releaes Version](https://img.shields.io/github/release/AllanWang/Frost-for-Facebook.svg)](https://github.com/AllanWang/Frost-for-Facebook/releases)
 [![Build Status](https://travis-ci.org/AllanWang/Frost-for-Facebook.svg?branch=dev)](https://travis-ci.org/AllanWang/Frost-for-Facebook)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/frost-for-facebook/localized.svg)](https://crowdin.com/project/frost-for-facebook)
 [![ZenHub](https://img.shields.io/badge/Shipping%20faster%20with-ZenHub-45529A.svg)](https://app.zenhub.com/workspace/o/allanwang/frost-for-facebook/boards)
@@ -81,4 +82,4 @@ Special thanks to the following awesome people for translating significant porti
 | Ukrainian | [Таня Делікатна](https://crowdin.com/profile/delikatna_i) &bull; [Вадим Жушман](https://crowdin.com/profile/android54544) |
 | Vietnamese | [Alienz](https://crowdin.com/profile/alienyd) &bull; [Nguyễn Thành Nam](https://crowdin.com/profile/nguyenthanhnam_246) &bull; [Volodymyr Lisivka](https://crowdin.com/profile/vlisivka) |
 
-The full activity stream for the translations can be found [here](https://crowdin.com/project/frost-for-facebook/activity_stream)
-\ No newline at end of file
+The full activity stream for the translations can be found [here](https://crowdin.com/project/frost-for-facebook/activity_stream)
diff --git a/app/build.gradle b/app/build.gradle
index 74e8015c..472669cc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,6 +7,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
 apply plugin: 'com.gladed.androidgitversion'
 
 apply from: '../spotless.gradle'
+group = APP_GROUP
 
 android {
     compileSdkVersion kau.targetSdk
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ad1fcbdc..ceb309f3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,6 +25,17 @@
         android:theme="@style/FrostTheme"
         android:usesCleartextTraffic="true"
         tools:ignore="UnusedAttribute">
+        <!-- Matches general label under NotificationUtils.kt -->
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_channel_id"
+            android:value="general" />
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_color"
+            android:resource="@color/facebook_blue" />
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/frost_f_24" />
+
         <activity
             android:name=".StartActivity"
             android:label="@string/frost_name"
@@ -48,7 +59,7 @@
             android:launchMode="singleTop"
             android:theme="@style/FrostTheme.Overlay.Slide" />
         <activity
-            android:name=".activities.WebOverlayBasicActivity"
+            android:name=".activities.WebOverlayDesktopActivity"
             android:configChanges="orientation|screenSize|locale"
             android:hardwareAccelerated="true"
             android:label="@string/frost_web"
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
index f4c1244f..56125303 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
@@ -30,6 +30,7 @@ import ca.allanwang.kau.adapters.ThemableIItemDelegate
 import ca.allanwang.kau.logging.KL
 import ca.allanwang.kau.utils.bindView
 import ca.allanwang.kau.utils.dimenPixelSize
+import ca.allanwang.kau.utils.drawable
 import ca.allanwang.kau.utils.resolveDrawable
 import ca.allanwang.kau.utils.startLink
 import ca.allanwang.kau.utils.string
@@ -156,17 +157,26 @@ class AboutActivity : AboutActivityBase(null, {
             init {
                 val c = itemView.context
                 val size = c.dimenPixelSize(R.dimen.kau_avatar_bounds)
-                images = arrayOf<Pair<IIcon, () -> Unit>>(
+
+                val icons: Array<Pair<Int, () -> Unit>> =
+                    arrayOf(R.drawable.ic_fdroid_24 to { c.startLink(R.string.fdroid_url) })
+                val iicons: Array<Pair<IIcon, () -> Unit>> = arrayOf(
                     GoogleMaterial.Icon.gmd_file_download to { c.startLink(R.string.github_downloads_url) },
                     CommunityMaterial.Icon2.cmd_reddit to { c.startLink(R.string.reddit_url) },
                     CommunityMaterial.Icon.cmd_github_circle to { c.startLink(R.string.github_url) },
                     CommunityMaterial.Icon2.cmd_slack to { c.startLink(R.string.slack_url) },
-                    CommunityMaterial.Icon2.cmd_xda to { c.startLink(R.string.xda_url) }
-                ).mapIndexed { i, (icon, onClick) ->
+                    CommunityMaterial.Icon2.cmd_xda to { c.startLink(R.string.xda_url) })
+
+                images = (icons.map { (icon, onClick) -> c.drawable(icon) to onClick } + iicons.map { (icon, onClick) ->
+                    icon.toDrawable(
+                        c,
+                        32
+                    ) to onClick
+                }).mapIndexed { i, (icon, onClick) ->
                     ImageView(c).apply {
                         layoutParams = ViewGroup.LayoutParams(size, size)
                         id = 109389 + i
-                        setImageDrawable(icon.toDrawable(context, 32))
+                        setImageDrawable(icon)
                         scaleType = ImageView.ScaleType.CENTER
                         background = context.resolveDrawable(android.R.attr.selectableItemBackgroundBorderless)
                         setOnClickListener { onClick() }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
index 610b2796..b80f06f7 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
@@ -146,7 +146,7 @@ class LoginActivity : BaseActivity() {
     private suspend fun loadProfile(id: Long): Boolean = withMainContext {
         suspendCancellableCoroutine<Boolean> { cont ->
             profileLoader.load(profilePictureUrl(id))
-                .transform(FrostGlide.roundCorner).listener(object : RequestListener<Drawable> {
+                .transform(FrostGlide.circleCrop).listener(object : RequestListener<Drawable> {
                     override fun onResourceReady(
                         resource: Drawable?,
                         model: Any?,
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
index 1ea655d1..accf9d98 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
@@ -58,7 +58,7 @@ import com.pitchedapps.frost.enums.OverlayContext
 import com.pitchedapps.frost.facebook.FB_URL_BASE
 import com.pitchedapps.frost.facebook.FbCookie
 import com.pitchedapps.frost.facebook.FbItem
-import com.pitchedapps.frost.facebook.USER_AGENT_BASIC
+import com.pitchedapps.frost.facebook.USER_AGENT_DESKTOP
 import com.pitchedapps.frost.facebook.formattedFbUrl
 import com.pitchedapps.frost.kotlin.subscribeDuringJob
 import com.pitchedapps.frost.services.FrostRunnable
@@ -141,10 +141,10 @@ class FrostWebActivity : WebOverlayActivityBase(false) {
 }
 
 /**
- * Variant that forces a basic user agent. This is largely internal,
+ * Variant that forces a desktop user agent. This is largely internal,
  * and is only necessary when we are launching from an existing [WebOverlayActivityBase]
  */
-class WebOverlayBasicActivity : WebOverlayActivityBase(true)
+class WebOverlayDesktopActivity : WebOverlayActivityBase(true)
 
 /**
  * Internal overlay for the app; this is tied with the main task and is singleTop as opposed to singleInstance
@@ -153,7 +153,7 @@ class WebOverlayActivity : WebOverlayActivityBase(false)
 
 @SuppressLint("Registered")
 @UseExperimental(ExperimentalCoroutinesApi::class)
-open class WebOverlayActivityBase(private val forceBasicAgent: Boolean) : BaseActivity(),
+open class WebOverlayActivityBase(private val forceDesktopAgent: Boolean) : BaseActivity(),
     ActivityContract, FrostContentContainer,
     VideoViewHolder, FileChooserContract by FileChooserDelegate() {
 
@@ -210,8 +210,8 @@ open class WebOverlayActivityBase(private val forceBasicAgent: Boolean) : BaseAc
         }
 
         with(web) {
-            if (forceBasicAgent) //todo check; the webview already adds it dynamically
-                userAgentString = USER_AGENT_BASIC
+            if (forceDesktopAgent) //todo check; the webview already adds it dynamically
+                userAgentString = USER_AGENT_DESKTOP
             Prefs.prevId = Prefs.userId
             launch {
                 if (userId != Prefs.userId)
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/debugger/OfflineWebsite.kt b/app/src/main/kotlin/com/pitchedapps/frost/debugger/OfflineWebsite.kt
index 30c812db..f128edcf 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/debugger/OfflineWebsite.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/debugger/OfflineWebsite.kt
@@ -19,7 +19,7 @@ package com.pitchedapps.frost.debugger
 import ca.allanwang.kau.logging.KauLoggerExtension
 import ca.allanwang.kau.utils.copyFromInputStream
 import com.pitchedapps.frost.facebook.FB_CSS_URL_MATCHER
-import com.pitchedapps.frost.facebook.USER_AGENT_BASIC
+import com.pitchedapps.frost.facebook.USER_AGENT_DESKTOP
 import com.pitchedapps.frost.facebook.get
 import com.pitchedapps.frost.facebook.requests.call
 import com.pitchedapps.frost.utils.createFreshDir
@@ -59,7 +59,7 @@ class OfflineWebsite(
      * Directory that holds all the files
      */
     val baseDir: File,
-    private val userAgent: String = USER_AGENT_BASIC
+    private val userAgent: String = USER_AGENT_DESKTOP
 ) {
 
     /**
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt
index 1d6937f7..f6316470 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt
@@ -22,18 +22,18 @@ package com.pitchedapps.frost.facebook
 
 const val FACEBOOK_COM = "facebook.com"
 const val FBCDN_NET = "fbcdn.net"
-const val HTTPS_FACEBOOK_COM = "https://$FACEBOOK_COM"
+const val HTTPS_FACEBOOK_COM = "https://$FACEBOOK_COM/"
 const val FB_URL_BASE = "https://m.$FACEBOOK_COM/"
 fun profilePictureUrl(id: Long) = "https://graph.facebook.com/$id/picture?type=large"
 const val FB_LOGIN_URL = "${FB_URL_BASE}login"
 const val FB_HOME_URL = "${FB_URL_BASE}home.php"
 
 // Default user agent
-const val USER_AGENT_FULL =
-    "Mozilla/5.0 (Linux; Android 7.1; Mi A1 Build/N2G47H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.83 Mobile Safari/537.36"
-// Basic user agent; non mobile version
-const val USER_AGENT_BASIC =
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Safari/537.36"
+const val USER_AGENT_MOBILE =
+    "Mozilla/5.0 (Linux; Android 8.0.0; ONEPLUS A3000) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Mobile Safari/537.36"
+// Desktop agent, for pages like messages
+const val USER_AGENT_DESKTOP =
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Safari/537.36"
 
 /**
  * Animation transition delay, just to ensure that the styles
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/FbRequest.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/FbRequest.kt
index b49fd970..8a89b973 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/FbRequest.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/FbRequest.kt
@@ -22,7 +22,7 @@ import com.pitchedapps.frost.facebook.FB_JSON_URL_MATCHER
 import com.pitchedapps.frost.facebook.FB_REV_MATCHER
 import com.pitchedapps.frost.facebook.FB_URL_BASE
 import com.pitchedapps.frost.facebook.FB_USER_MATCHER
-import com.pitchedapps.frost.facebook.USER_AGENT_BASIC
+import com.pitchedapps.frost.facebook.USER_AGENT_DESKTOP
 import com.pitchedapps.frost.facebook.get
 import com.pitchedapps.frost.kotlin.Flyweight
 import com.pitchedapps.frost.utils.L
@@ -97,7 +97,7 @@ internal fun List<Pair<String, Any?>>.withEmptyData(vararg key: String): List<Pa
 
 internal fun String?.requestBuilder(): Request.Builder {
     val builder = Request.Builder()
-        .header("User-Agent", USER_AGENT_BASIC)
+        .header("User-Agent", USER_AGENT_DESKTOP)
     if (this != null)
         builder.header("Cookie", this)
 //        .cacheControl(CacheControl.FORCE_NETWORK)
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/glide/GlideUtils.kt b/app/src/main/kotlin/com/pitchedapps/frost/glide/GlideUtils.kt
index 870e2ccd..537ad89c 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/glide/GlideUtils.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/glide/GlideUtils.kt
@@ -38,8 +38,6 @@ import okhttp3.Response
  * Each caller will generate a new one upon request
  */
 object FrostGlide {
-    val roundCorner
-        get() = RoundCornerTransformation()
     val circleCrop
         get() = CircleCrop()
 }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/glide/RoundCornerTransformation.kt b/app/src/main/kotlin/com/pitchedapps/frost/glide/RoundCornerTransformation.kt
deleted file mode 100644
index 564224ea..00000000
--- a/app/src/main/kotlin/com/pitchedapps/frost/glide/RoundCornerTransformation.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2018 Allan Wang
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.pitchedapps.frost.glide
-
-import android.graphics.Bitmap
-import android.graphics.BitmapShader
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.graphics.RectF
-import android.graphics.Shader
-import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool
-import com.bumptech.glide.load.resource.bitmap.BitmapTransformation
-import com.pitchedapps.frost.utils.Prefs
-import java.security.MessageDigest
-
-/**
- * Created by Allan Wang on 27/12/17.
- */
-class RoundCornerTransformation : BitmapTransformation() {
-
-    override fun updateDiskCacheKey(messageDigest: MessageDigest) {
-        messageDigest.update("FrostRoundCornerTransform-${Prefs.showRoundedIcons}".toByteArray())
-    }
-
-    override fun transform(pool: BitmapPool, toTransform: Bitmap, outWidth: Int, outHeight: Int): Bitmap {
-
-        val width = toTransform.width
-        val height = toTransform.height
-
-        val bitmap = pool.get(width, height, Bitmap.Config.ARGB_8888)
-        bitmap.setHasAlpha(true)
-
-        val radius = Math.min(width, height).toFloat() /
-            (if (Prefs.showRoundedIcons) 2f else 10f)
-
-        val canvas = Canvas(bitmap)
-        val paint = Paint()
-        paint.isAntiAlias = true
-        paint.shader = BitmapShader(toTransform, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP)
-        canvas.drawRoundRect(
-            RectF(0f, 0f, width.toFloat(), height.toFloat()),
-            radius, radius, paint
-        )
-
-        return bitmap
-    }
-}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/iitems/MenuIItem.kt b/app/src/main/kotlin/com/pitchedapps/frost/iitems/MenuIItem.kt
index 651a4a2a..d20e8cde 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/iitems/MenuIItem.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/iitems/MenuIItem.kt
@@ -59,7 +59,7 @@ class MenuContentIItem(val data: MenuItem) :
             if (iconUrl != null)
                 GlideApp.with(itemView)
                     .load(iconUrl)
-                    .transform(FrostGlide.roundCorner)
+                    .transform(FrostGlide.circleCrop)
                     .into(icon.visible())
             else
                 icon.gone()
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt b/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt
index e8332955..8b196a64 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt
@@ -106,7 +106,7 @@ class NotificationIItem(val notification: FrostNotif, val cookie: String) :
 
             val glide = glide
             glide.load(notif.img)
-                .transform(FrostGlide.roundCorner)
+                .transform(FrostGlide.circleCrop)
                 .into(avatar)
             if (notif.thumbnailUrl != null)
                 glide.load(notif.thumbnailUrl).into(thumbnail.visible())
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt
index a466feec..e7efbf2a 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt
@@ -41,7 +41,7 @@ import java.util.Locale
  * The enum name must match the css file name
  */
 enum class CssAssets(val folder: String = THEME_FOLDER) : InjectorContract {
-    MATERIAL_LIGHT, MATERIAL_DARK, MATERIAL_AMOLED, MATERIAL_GLASS, CUSTOM, ROUND_ICONS("components")
+    MATERIAL_LIGHT, MATERIAL_DARK, MATERIAL_AMOLED, MATERIAL_GLASS, CUSTOM
     ;
 
     @VisibleForTesting
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt
index 292b7ff5..891a1dbf 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt
@@ -26,7 +26,7 @@ import android.webkit.WebView
 enum class CssHider(vararg val items: String) : InjectorContract {
     CORE("[data-sigil=m_login_upsell]", "[role=progressbar]"),
     HEADER(
-        "#header", "#mJewelNav", "[data-sigil=MTopBlueBarHeader]",
+        "#header:not(.mFuturePageHeader):not(.titled)", "#mJewelNav", "[data-sigil=MTopBlueBarHeader]",
         "#header-notices", "[data-sigil*=m-promo-jewel-header]"
     ),
     ADS(
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt
index e0be7977..ad42418e 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt
@@ -33,7 +33,7 @@ import java.util.Locale
  * The enum name must match the css file name
  */
 enum class JsAssets : InjectorContract {
-    MENU, CLICK_A, CONTEXT_A, MEDIA, HEADER_BADGES, HEADER_HIDER, TEXTAREA_LISTENER, NOTIF_MSG,
+    MENU, CLICK_A, CONTEXT_A, MEDIA, HEADER_BADGES, TEXTAREA_LISTENER, NOTIF_MSG,
     DOCUMENT_WATCHER
     ;
 
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt b/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
index 631912a3..6f039784 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
@@ -122,14 +122,19 @@ enum class NotificationType(
             L.v { "$name notification data not found" }
             return -1
         }
-        val notifContents = response.data.getUnreadNotifications(data).filter { notif ->
-            val inText = notif.text.let { text ->
-                Prefs.notificationKeywords.none { text.contains(it, true) }
+
+        /**
+         * Checks that the text doesn't contain any blacklisted keywords
+         */
+        fun validText(text: String?): Boolean {
+            val t = text ?: return true
+            return Prefs.notificationKeywords.none {
+                t.contains(it, true)
             }
-            val inTitle = notif.title?.let { title ->
-                Prefs.notificationKeywords.none { title.contains(it, true) }
-            } ?: false
-            inText || inTitle
+        }
+
+        val notifContents = response.data.getUnreadNotifications(data).filter { notif ->
+            validText(notif.title) && validText(notif.text)
         }
         if (notifContents.isEmpty()) return 0
         val userId = data.id
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationUtils.kt b/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationUtils.kt
index 20a497e3..bba2a9a1 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationUtils.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationUtils.kt
@@ -46,14 +46,14 @@ fun setupNotificationChannels(c: Context) {
     val manager = c.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
     val appName = c.string(R.string.frost_name)
     val msg = c.string(R.string.messages)
+    manager.createNotificationChannel(NOTIF_CHANNEL_GENERAL, appName)
+    manager.createNotificationChannel(NOTIF_CHANNEL_MESSAGES, "$appName: $msg")
     manager.notificationChannels
         .filter {
             it.id != NOTIF_CHANNEL_GENERAL &&
                 it.id != NOTIF_CHANNEL_MESSAGES
         }
         .forEach { manager.deleteNotificationChannel(it.id) }
-    manager.createNotificationChannel(NOTIF_CHANNEL_GENERAL, appName)
-    manager.createNotificationChannel(NOTIF_CHANNEL_MESSAGES, "$appName: $msg")
     L.d { "Created notification channels: ${manager.notificationChannels.size} channels, ${manager.notificationChannelGroups.size} groups" }
 }
 
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Appearance.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Appearance.kt
index 1b1ca796..a6437123 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Appearance.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Appearance.kt
@@ -28,7 +28,6 @@ import com.pitchedapps.frost.enums.Theme
 import com.pitchedapps.frost.injectors.CssAssets
 import com.pitchedapps.frost.utils.Prefs
 import com.pitchedapps.frost.utils.REQUEST_NAV
-import com.pitchedapps.frost.utils.REQUEST_REFRESH
 import com.pitchedapps.frost.utils.REQUEST_TEXT_ZOOM
 import com.pitchedapps.frost.utils.frostEvent
 import com.pitchedapps.frost.utils.frostNavigationBar
@@ -155,13 +154,6 @@ fun SettingsActivity.getAppearancePrefs(): KPrefAdapterBuilder.() -> Unit = {
         onClick = { launchTabCustomizerActivity() }
     }
 
-    checkbox(R.string.rounded_icons, Prefs::showRoundedIcons, {
-        Prefs.showRoundedIcons = it
-        setFrostResult(REQUEST_REFRESH)
-    }) {
-        descRes = R.string.rounded_icons_desc
-    }
-
     checkbox(R.string.tint_nav, Prefs::tintNavBar, {
         Prefs.tintNavBar = it
         frostNavigationBar()
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt
index 10fa5c99..b77c0f2d 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt
@@ -19,8 +19,10 @@ package com.pitchedapps.frost.settings
 import ca.allanwang.kau.kpref.activity.KPrefAdapterBuilder
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.activities.SettingsActivity
+import com.pitchedapps.frost.facebook.FB_URL_BASE
 import com.pitchedapps.frost.utils.Prefs
 import com.pitchedapps.frost.utils.REQUEST_REFRESH
+import com.pitchedapps.frost.utils.launchWebOverlay
 
 /**
  * Created by Allan Wang on 2017-06-30.
@@ -58,6 +60,13 @@ fun SettingsActivity.getBehaviourPrefs(): KPrefAdapterBuilder.() -> Unit = {
         descRes = R.string.enable_pip_desc
     }
 
+    plainText(R.string.autoplay_settings) {
+        descRes = R.string.autoplay_settings_desc
+        onClick = {
+            launchWebOverlay("${FB_URL_BASE}settings/videos/")
+        }
+    }
+
     checkbox(R.string.exit_confirmation, Prefs::exitConfirmation, { Prefs.exitConfirmation = it }) {
         descRes = R.string.exit_confirmation_desc
     }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/BuildUtils.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/BuildUtils.kt
index 33da56f2..65ef3056 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/BuildUtils.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/BuildUtils.kt
@@ -30,7 +30,7 @@ object BuildUtils {
     fun match(version: String): Data? {
         val regex = Regex("([0-9]+\\.[0-9]+\\.[0-9]+)-?(.*?)")
         val result = regex.matchEntire(version)?.groupValues ?: return null
-        return Data(result[1], result[2])
+        return Data("v${result[1]}", result[2])
     }
 
     fun getAllStages(): Array<String> =
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Downloader.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Downloader.kt
index 64094d1e..50863e10 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Downloader.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Downloader.kt
@@ -30,7 +30,7 @@ import ca.allanwang.kau.utils.string
 import ca.allanwang.kau.utils.toast
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.db.CookieEntity
-import com.pitchedapps.frost.facebook.USER_AGENT_BASIC
+import com.pitchedapps.frost.facebook.USER_AGENT_DESKTOP
 
 /**
  * Created by Allan Wang on 2017-08-04.
@@ -40,7 +40,7 @@ import com.pitchedapps.frost.facebook.USER_AGENT_BASIC
 fun Context.frostDownload(
     cookie: CookieEntity,
     url: String?,
-    userAgent: String = USER_AGENT_BASIC,
+    userAgent: String = USER_AGENT_DESKTOP,
     contentDisposition: String? = null,
     mimeType: String? = null,
     contentLength: Long = 0L
@@ -52,7 +52,7 @@ fun Context.frostDownload(
 fun Context.frostDownload(
     cookie: CookieEntity,
     uri: Uri?,
-    userAgent: String = USER_AGENT_BASIC,
+    userAgent: String = USER_AGENT_DESKTOP,
     contentDisposition: String? = null,
     mimeType: String? = null,
     contentLength: Long = 0L
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
index 9a63f527..391d422a 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
@@ -116,8 +116,6 @@ object Prefs : KPref() {
 
     var aggressiveRecents: Boolean by kpref("aggressive_recents", false)
 
-    var showRoundedIcons: Boolean by kpref("rounded_icons", true)
-
     var showComposer: Boolean by kpref("status_composer_feed", true)
 
     var showSuggestedFriends: Boolean by kpref("suggested_friends_feed", true)
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
index 5a104458..711d7e18 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
@@ -61,14 +61,14 @@ import com.pitchedapps.frost.activities.SettingsActivity
 import com.pitchedapps.frost.activities.TabCustomizerActivity
 import com.pitchedapps.frost.activities.WebOverlayActivity
 import com.pitchedapps.frost.activities.WebOverlayActivityBase
-import com.pitchedapps.frost.activities.WebOverlayBasicActivity
+import com.pitchedapps.frost.activities.WebOverlayDesktopActivity
 import com.pitchedapps.frost.db.CookieEntity
 import com.pitchedapps.frost.facebook.FACEBOOK_COM
 import com.pitchedapps.frost.facebook.FBCDN_NET
 import com.pitchedapps.frost.facebook.FbCookie
 import com.pitchedapps.frost.facebook.FbItem
 import com.pitchedapps.frost.facebook.FbUrlFormatter.Companion.VIDEO_REDIRECT
-import com.pitchedapps.frost.facebook.USER_AGENT_BASIC
+import com.pitchedapps.frost.facebook.USER_AGENT_DESKTOP
 import com.pitchedapps.frost.facebook.formattedFbUrl
 import com.pitchedapps.frost.injectors.CssAssets
 import com.pitchedapps.frost.injectors.JsAssets
@@ -141,7 +141,7 @@ private inline fun <reified T : WebOverlayActivityBase> Context.launchWebOverlay
 
 fun Context.launchWebOverlay(url: String) = launchWebOverlayImpl<WebOverlayActivity>(url)
 
-fun Context.launchWebOverlayBasic(url: String) = launchWebOverlayImpl<WebOverlayBasicActivity>(url)
+fun Context.launchWebOverlayDesktop(url: String) = launchWebOverlayImpl<WebOverlayDesktopActivity>(url)
 
 private fun Context.fadeBundle() = ActivityOptions.makeCustomAnimation(
     this,
@@ -393,7 +393,7 @@ fun frostJsoup(cookie: String?, url: String) =
     Jsoup.connect(url).run {
         if (cookie.isNullOrBlank()) this
         else cookie(FACEBOOK_COM, cookie)
-    }.userAgent(USER_AGENT_BASIC).get()!!
+    }.userAgent(USER_AGENT_DESKTOP).get()!!
 
 fun Element.first(vararg select: String): Element? {
     select.forEach {
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt
index 07eaed0a..0269b1a9 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt
@@ -53,7 +53,7 @@ class AccountItem(val cookie: CookieEntity?) : KauIItem<AccountItem, AccountItem
             if (cookie != null) {
                 text.text = cookie.name
                 GlideApp.with(itemView).load(profilePictureUrl(cookie.id))
-                    .transform(FrostGlide.roundCorner).listener(object : RequestListener<Drawable> {
+                    .transform(FrostGlide.circleCrop).listener(object : RequestListener<Drawable> {
                         override fun onResourceReady(
                             resource: Drawable?,
                             model: Any?,
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt
index 594b0acd..1dd027fd 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt
@@ -32,8 +32,8 @@ import com.pitchedapps.frost.db.FrostDatabase
 import com.pitchedapps.frost.db.currentCookie
 import com.pitchedapps.frost.facebook.FB_HOME_URL
 import com.pitchedapps.frost.facebook.FbItem
-import com.pitchedapps.frost.facebook.USER_AGENT_BASIC
-import com.pitchedapps.frost.facebook.USER_AGENT_FULL
+import com.pitchedapps.frost.facebook.USER_AGENT_DESKTOP
+import com.pitchedapps.frost.facebook.USER_AGENT_MOBILE
 import com.pitchedapps.frost.fragments.WebFragment
 import com.pitchedapps.frost.utils.Prefs
 import com.pitchedapps.frost.utils.ctxCoroutine
@@ -42,7 +42,7 @@ import com.pitchedapps.frost.web.FrostChromeClient
 import com.pitchedapps.frost.web.FrostJSI
 import com.pitchedapps.frost.web.FrostWebViewClient
 import com.pitchedapps.frost.web.NestedWebView
-import com.pitchedapps.frost.web.shouldUseBasicAgent
+import com.pitchedapps.frost.web.shouldUseDesktopAgent
 
 /**
  * Created by Allan Wang on 2017-05-29.
@@ -70,10 +70,11 @@ class FrostWebView @JvmOverloads constructor(
     @SuppressLint("SetJavaScriptEnabled")
     override fun bind(container: FrostContentContainer): View {
         userAgentString =
-            if (parent.baseEnum == FbItem.MESSAGES || parent.baseUrl.shouldUseBasicAgent) USER_AGENT_BASIC
-            else USER_AGENT_FULL
+            if (parent.baseEnum == FbItem.MESSAGES || parent.baseUrl.shouldUseDesktopAgent) USER_AGENT_DESKTOP
+            else USER_AGENT_MOBILE
         with(settings) {
             javaScriptEnabled = true
+            mediaPlaybackRequiresUserGesture = false // TODO check if we need this
             allowFileAccess = true
             textZoom = Prefs.webTextScaling
         }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/DebugWebView.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/DebugWebView.kt
index 6b186b1c..6511ef9f 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/DebugWebView.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/DebugWebView.kt
@@ -24,8 +24,7 @@ import android.util.AttributeSet
 import android.view.View
 import android.webkit.WebView
 import ca.allanwang.kau.utils.withAlpha
-import com.pitchedapps.frost.facebook.USER_AGENT_BASIC
-import com.pitchedapps.frost.injectors.CssAssets
+import com.pitchedapps.frost.facebook.USER_AGENT_MOBILE
 import com.pitchedapps.frost.injectors.CssHider
 import com.pitchedapps.frost.injectors.jsInject
 import com.pitchedapps.frost.utils.L
@@ -54,9 +53,9 @@ class DebugWebView @JvmOverloads constructor(
     }
 
     @SuppressLint("SetJavaScriptEnabled")
-    fun setupWebview() {
+    private fun setupWebview() {
         settings.javaScriptEnabled = true
-        settings.userAgentString = USER_AGENT_BASIC
+        settings.userAgentString = USER_AGENT_MOBILE
         setLayerType(View.LAYER_TYPE_HARDWARE, null)
         webViewClient = DebugClient()
         isDrawingCacheEnabled = true
@@ -102,7 +101,6 @@ class DebugWebView @JvmOverloads constructor(
             injectBackgroundColor()
             if (url.isFacebookUrl)
                 view.jsInject(
-                    CssAssets.ROUND_ICONS.maybe(Prefs.showRoundedIcons),
 //                        CssHider.CORE,
                     CssHider.COMPOSER.maybe(!Prefs.showComposer),
                     CssHider.STORIES.maybe(!Prefs.showStories),
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
index 24885fdf..81ade98f 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
@@ -22,7 +22,7 @@ import com.pitchedapps.frost.activities.WebOverlayActivityBase
 import com.pitchedapps.frost.contracts.VideoViewHolder
 import com.pitchedapps.frost.facebook.FbCookie
 import com.pitchedapps.frost.facebook.FbItem
-import com.pitchedapps.frost.facebook.USER_AGENT_BASIC
+import com.pitchedapps.frost.facebook.USER_AGENT_DESKTOP
 import com.pitchedapps.frost.facebook.formattedFbUrl
 import com.pitchedapps.frost.utils.L
 import com.pitchedapps.frost.utils.Prefs
@@ -32,7 +32,7 @@ import com.pitchedapps.frost.utils.isIndirectImageUrl
 import com.pitchedapps.frost.utils.isVideoUrl
 import com.pitchedapps.frost.utils.launchImageActivity
 import com.pitchedapps.frost.utils.launchWebOverlay
-import com.pitchedapps.frost.utils.launchWebOverlayBasic
+import com.pitchedapps.frost.utils.launchWebOverlayDesktop
 import com.pitchedapps.frost.views.FrostWebView
 
 /**
@@ -76,15 +76,15 @@ fun FrostWebView.requestWebOverlay(url: String): Boolean {
     if (!Prefs.overlayEnabled) return false
     if (context is WebOverlayActivityBase) {
         L.v { "Check web request from overlay" }
-        val shouldUseBasic = url.formattedFbUrl.shouldUseBasicAgent
+        val shouldUseDesktop = url.formattedFbUrl.shouldUseDesktopAgent
         //already overlay; manage user agent
-        if (userAgentString != USER_AGENT_BASIC && shouldUseBasic) {
-            L.i { "Switch to basic agent overlay" }
-            context.launchWebOverlayBasic(url)
+        if (userAgentString != USER_AGENT_DESKTOP && shouldUseDesktop) {
+            L.i { "Switch to desktop agent overlay" }
+            context.launchWebOverlayDesktop(url)
             return true
         }
-        if (userAgentString == USER_AGENT_BASIC && !shouldUseBasic) {
-            L.i { "Switch from basic agent" }
+        if (userAgentString == USER_AGENT_DESKTOP && !shouldUseDesktop) {
+            L.i { "Switch from desktop agent" }
             context.launchWebOverlay(url)
             return true
         }
@@ -103,9 +103,9 @@ val messageWhitelist: Set<String> =
     setOf(FbItem.MESSAGES, FbItem.CHAT, FbItem.FEED_MOST_RECENT, FbItem.FEED_TOP_STORIES)
         .mapTo(mutableSetOf(), FbItem::url)
 
-val String.shouldUseBasicAgent: Boolean
+val String.shouldUseDesktopAgent: Boolean
     get() = when {
-        contains("story.php") -> false // do not use basic for comment section
+        contains("story.php") -> false // do not use desktop for comment section
         contains("/events/") -> false // do not use for events (namely the map)
         contains("/messages") -> true // must use for messages
         else -> false // default to normal user agent
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
index e162f9da..003ed7f9 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
@@ -27,7 +27,6 @@ import com.pitchedapps.frost.facebook.FB_URL_BASE
 import com.pitchedapps.frost.facebook.FbCookie
 import com.pitchedapps.frost.facebook.FbItem
 import com.pitchedapps.frost.facebook.formattedFbUrl
-import com.pitchedapps.frost.injectors.CssAssets
 import com.pitchedapps.frost.injectors.CssHider
 import com.pitchedapps.frost.injectors.JsActions
 import com.pitchedapps.frost.injectors.JsAssets
@@ -91,7 +90,6 @@ open class FrostWebViewClient(val web: FrostWebView) : BaseWebViewClient() {
         injectBackgroundColor()
         if (url.isFacebookUrl)
             view.jsInject(
-                CssAssets.ROUND_ICONS.maybe(Prefs.showRoundedIcons),
 //                    CssHider.CORE,
                 CssHider.HEADER,
                 CssHider.COMPOSER.maybe(!Prefs.showComposer),
@@ -107,7 +105,6 @@ open class FrostWebViewClient(val web: FrostWebView) : BaseWebViewClient() {
                 JsAssets.CLICK_A,
                 CssHider.ADS.maybe(!Prefs.showFacebookAds),
                 JsAssets.CONTEXT_A,
-//                    JsAssets.HEADER_HIDER,
                 JsAssets.MEDIA
             )
         else
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
index 4b891800..79c6d5ba 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
@@ -35,7 +35,6 @@ import com.pitchedapps.frost.facebook.FB_USER_MATCHER
 import com.pitchedapps.frost.facebook.FbCookie
 import com.pitchedapps.frost.facebook.get
 import com.pitchedapps.frost.injectors.CssHider
-import com.pitchedapps.frost.injectors.JsAssets
 import com.pitchedapps.frost.injectors.jsInject
 import com.pitchedapps.frost.utils.L
 import com.pitchedapps.frost.utils.Prefs
@@ -98,7 +97,6 @@ class LoginWebView @JvmOverloads constructor(
             view.setBackgroundColor(Color.TRANSPARENT)
             if (url.isFacebookUrl)
                 view.jsInject(
-                    JsAssets.HEADER_HIDER,
                     CssHider.CORE,
                     Prefs.themeInjector
                 )
diff --git a/app/src/main/res/drawable/ic_fdroid_24.xml b/app/src/main/res/drawable/ic_fdroid_24.xml
new file mode 100644
index 00000000..2c718fa6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_fdroid_24.xml
@@ -0,0 +1,5 @@
+<!-- Adapted from https://gitlab.com/fdroid/artwork/blob/master/fdroid-logo-2015/default_notification.svg -->
+<vector android:height="24dp" android:viewportHeight="48"
+    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#fff" android:fillType="evenOdd" android:pathData="M2.82,1.24A1.25,1.25 0,0 0,1.8 3.27l3.6,4.66L5.2,16a3,3 0,0 0,3 3h32a3,3 0,0 0,3 -3c0,-7.38 -0.08,-7.74 -0.2,-8.07l3.6,-4.66a1.25,1.25 0,0 0,-1.06 -2.03,1.25 1.25,0 0,0 -0.93,0.5L41.2,6.18a2.99,2.99 0,0 0,-0.98 -0.18c-32.35,0 -32.68,0.07 -33,0.18L3.79,1.74a1.25,1.25 0,0 0,-0.96 -0.5zM14.58,9.75a3.38,3.38 0,0 1,3.37 3.38,3.38 3.38,0 0,1 -3.37,3.37 3.38,3.38 0,0 1,-3.38 -3.38,3.38 3.38,0 0,1 3.38,-3.37zM34.08,9.75a3.38,3.38 0,0 1,3.37 3.38,3.38 3.38,0 0,1 -3.37,3.37 3.38,3.38 0,0 1,-3.38 -3.38,3.38 3.38,0 0,1 3.38,-3.37zM8.2,20a2.97,2.97 0,0 0,-3 2.97L5.2,43a3,3 0,0 0,3 3h32a3,3 0,0 0,3 -3L43.2,22.97a2.97,2.97 0,0 0,-2.4 -2.91L8.21,20z"/>
+</vector>
diff --git a/app/src/main/res/values-cs-rCZ/strings_pref_appearance.xml b/app/src/main/res/values-cs-rCZ/strings_pref_appearance.xml
index 711b8943..8299a26c 100644
--- a/app/src/main/res/values-cs-rCZ/strings_pref_appearance.xml
+++ b/app/src/main/res/values-cs-rCZ/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Nastavit rozložení hlavního zobrazení aktivit</string>
     <string name="main_tabs">Hlavní záložky aktivit</string>
     <string name="main_tabs_desc">Nastavte záložky viditelné v hlavním pohledu</string>
-    <string name="rounded_icons">Kulaté ikony</string>
-    <string name="rounded_icons_desc">Ikony profilových fotek a skupinových konverzacích budou kulaté</string>
     <string name="tint_nav">Odstín navigační lišty</string>
     <string name="tint_nav_desc">Navigační lišta bude mít stejnou barvu jako je základní barva</string>
     <string name="web_text_scaling">Zvětšující se text na webu</string>
diff --git a/app/src/main/res/values-da-rDK/strings_pref_appearance.xml b/app/src/main/res/values-da-rDK/strings_pref_appearance.xml
index 3e73f42b..2b1f0130 100644
--- a/app/src/main/res/values-da-rDK/strings_pref_appearance.xml
+++ b/app/src/main/res/values-da-rDK/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Vælg hovedaktivitetslayout</string>
     <string name="main_tabs">Hovedaktivitetsfaner</string>
     <string name="main_tabs_desc">Vælg hvilke faner, du vil se i din hovedaktivitet</string>
-    <string name="rounded_icons">Afrundede ikoner</string>
-    <string name="rounded_icons_desc">Profilfotos og gruppesamtale-ikoner vil blive afrundet</string>
     <string name="tint_nav">Farv navigationsbjælke</string>
     <string name="tint_nav_desc">Navigationsbjælke vil have samme farve som headeren</string>
     <string name="web_text_scaling">Internettekstskalering</string>
diff --git a/app/src/main/res/values-de-rDE/strings_pref_appearance.xml b/app/src/main/res/values-de-rDE/strings_pref_appearance.xml
index 46ff7a62..3082cb4f 100644
--- a/app/src/main/res/values-de-rDE/strings_pref_appearance.xml
+++ b/app/src/main/res/values-de-rDE/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Setzte das Haupt-Aktivitäten Layout</string>
     <string name="main_tabs">Haupt-Aktivitäten Tabs</string>
     <string name="main_tabs_desc">Passen Sie die Tabs an, die Sie in Ihrer Hauptseite sehen wollen</string>
-    <string name="rounded_icons">Runde Symbole</string>
-    <string name="rounded_icons_desc">Profilfotos und Gruppengespräch Symbole werden abgerundet</string>
     <string name="tint_nav">Färbe Navigationsbar</string>
     <string name="tint_nav_desc">Navigationsleiste wird die gleiche Farbe wie die Kopfzeile sein</string>
     <string name="web_text_scaling">Web Textskalierung</string>
diff --git a/app/src/main/res/values-es-rES/strings_pref_appearance.xml b/app/src/main/res/values-es-rES/strings_pref_appearance.xml
index d36ad1e2..98bebc8d 100644
--- a/app/src/main/res/values-es-rES/strings_pref_appearance.xml
+++ b/app/src/main/res/values-es-rES/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Establecer Diseño de la Pantalla Principal</string>
     <string name="main_tabs">Pestañas de actividad</string>
     <string name="main_tabs_desc">Personaliza las pestañas que verás en la pantalla principal</string>
-    <string name="rounded_icons">Iconos redondeados</string>
-    <string name="rounded_icons_desc">Los iconos de conversación de grupo y fotos de perfil se redondearán</string>
     <string name="tint_nav">Colorear Barra de Navegación</string>
     <string name="tint_nav_desc">La barra de navegación será del mismo color que la cabecera</string>
     <string name="web_text_scaling">Tamaño de texto Web</string>
diff --git a/app/src/main/res/values-fr-rFR/strings_pref_appearance.xml b/app/src/main/res/values-fr-rFR/strings_pref_appearance.xml
index 2a6ca45a..f1111b86 100644
--- a/app/src/main/res/values-fr-rFR/strings_pref_appearance.xml
+++ b/app/src/main/res/values-fr-rFR/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Régler la disposition de l\'activité principale</string>
     <string name="main_tabs">Onglets de l\'activité principale</string>
     <string name="main_tabs_desc">Personnalisez les onglets que vous verrez dans votre activité principale</string>
-    <string name="rounded_icons">Icônes rondes</string>
-    <string name="rounded_icons_desc">Les photos de profil et les icônes de conversation de groupe seront arrondis</string>
     <string name="tint_nav">Teinter la barre de navigation</string>
     <string name="tint_nav_desc">La barre de navigation sera de la même couleur que l\'en-tête</string>
     <string name="web_text_scaling">Échelle de texte Web</string>
diff --git a/app/src/main/res/values-gl-rES/strings.xml b/app/src/main/res/values-gl-rES/strings.xml
index 0971fa90..9d9c8e50 100644
--- a/app/src/main/res/values-gl-rES/strings.xml
+++ b/app/src/main/res/values-gl-rES/strings.xml
@@ -17,6 +17,7 @@
     <string name="birthdays">Aniversarios</string>
     <string name="chat">Chat</string>
     <string name="photos">Fotos</string>
+    <string name="marketplace">Mercado</string>
     <string name="notes">Notas</string>
     <string name="on_this_day">Neste día</string>
     <string name="loading_account">Preparándoo todo…</string>
diff --git a/app/src/main/res/values-gl-rES/strings_pref_appearance.xml b/app/src/main/res/values-gl-rES/strings_pref_appearance.xml
index b028d2a1..c23c57f7 100644
--- a/app/src/main/res/values-gl-rES/strings_pref_appearance.xml
+++ b/app/src/main/res/values-gl-rES/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Deseño da pantalla principal</string>
     <string name="main_tabs">Lapelas da pantalla principal</string>
     <string name="main_tabs_desc">Personaliza as lapelas que verás como principais</string>
-    <string name="rounded_icons">Iconas arredondadas</string>
-    <string name="rounded_icons_desc">As fotos dos perfís e as iconas de conversas en grupo serán redondas</string>
     <string name="tint_nav">Cor da barra de navegación</string>
     <string name="tint_nav_desc">A barra de navegación terá a mesma cor que a cabeceira</string>
     <string name="web_text_scaling">Tamaño do texto web</string>
diff --git a/app/src/main/res/values-hu-rHU/strings_pref_appearance.xml b/app/src/main/res/values-hu-rHU/strings_pref_appearance.xml
index 12146223..4ca85c23 100644
--- a/app/src/main/res/values-hu-rHU/strings_pref_appearance.xml
+++ b/app/src/main/res/values-hu-rHU/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Főképernyő kiosztása</string>
     <string name="main_tabs">Főképernyő lapjai</string>
     <string name="main_tabs_desc">Testreszabhatod, milyen lapokat szeretnél látni a főképernyőn</string>
-    <string name="rounded_icons">Kerek ikonok</string>
-    <string name="rounded_icons_desc">A profilképek és csoportos beszélgetések ikonjai kerekítve lesznek</string>
     <string name="tint_nav">Áttetsző navigációs sáv</string>
     <string name="tint_nav_desc">A navigációs sáv a fejléccel megegyező színű lesz</string>
     <string name="web_text_scaling">Webes szöveg méretezése</string>
diff --git a/app/src/main/res/values-in-rID/strings_pref_appearance.xml b/app/src/main/res/values-in-rID/strings_pref_appearance.xml
index 9253ba75..e7e4d189 100644
--- a/app/src/main/res/values-in-rID/strings_pref_appearance.xml
+++ b/app/src/main/res/values-in-rID/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Atur Aktifitas Tataletak Utama</string>
     <string name="main_tabs">Tab Tataletak Utama</string>
     <string name="main_tabs_desc">Sesuaikan tab yang akan Anda lihat di aktifitas utama Anda</string>
-    <string name="rounded_icons">Membulatkan Ikon</string>
-    <string name="rounded_icons_desc">Foto profil dan ikon percakapan grup akan dibulatkan</string>
     <string name="tint_nav">Warna Bilah Navigasi</string>
     <string name="tint_nav_desc">Bilah navigasi akan sama warna dengan header</string>
     <string name="web_text_scaling">Penskalaan Teks Web</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index af70ad7c..5a5acbd6 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-    <string name="feed">Notizie</string>
+    <string name="feed">Sezione Notizie</string>
     <string name="most_recent">Più recenti</string>
-    <string name="top_stories">Migliori Storie</string>
+    <string name="top_stories">Storie in evidenza</string>
     <string name="profile">Profilo</string>
     <string name="bookmarks">Segnalibri</string>
     <string name="events">Eventi</string>
@@ -17,6 +17,7 @@
     <string name="birthdays">Compleanni</string>
     <string name="chat">Chat</string>
     <string name="photos">Foto</string>
+    <string name="marketplace">Marketplace</string>
     <string name="notes">Note</string>
     <string name="on_this_day">Accadde Oggi</string>
     <string name="loading_account">Preparando l\'occorrente…</string>
@@ -26,14 +27,14 @@
     <string name="frost_requests">Richieste a Frost</string>
     <string name="frost_notifications">Notifiche di Frost</string>
     <string name="requires_custom_theme">Richiede un tema personalizzato</string>
-    <string name="subject">Soggetto</string>
+    <string name="subject">Argomento</string>
     <string name="share">Condividi</string>
     <string name="web_overlay_swipe_hint">Scorri a destra per tornare alla schermata precedente.</string>
     <string name="profile_picture">Immagine Profilo</string>
     <string name="new_message">Nuovo Messaggio</string>
     <string name="no_text">Nessun testo</string>
     <string name="show_all_results">Mostra tutti i risultati</string>
-    <string name="frost_description">Frost è un\'alternativa completamente personalizzabile e completamente funzionante all\'app ufficiale di Facebook; Scritta da zero e fieramente open source.</string>
+    <string name="frost_description">Frost è un\'alternativa completamente personalizzabile e funzionante all\'app ufficiale di Facebook, scritta da zero e orgogliosamente open source.</string>
     <string name="faq_title">Frost FAQ</string>
     <string name="html_extraction_error">Sì è verificato un errore nell\'estrazione del codice html.</string>
     <string name="html_extraction_cancelled">La richiesta è stata cancellata.</string>
@@ -43,6 +44,6 @@
     <string name="bottom_bar">Barra Inferiore</string>
     <string name="preview">Anteprima</string>
     <string name="options">Opzioni</string>
-    <string name="tab_customizer_instructions">Tieni premuto e trascina per riordinare le icone.</string>
+    <string name="tab_customizer_instructions">Per riordinare un\'icona tienila premuta e trascinala.</string>
     <string name="no_new_notifications">Nessuna nuova notifica trovata</string>
 </resources>
diff --git a/app/src/main/res/values-it-rIT/strings_download.xml b/app/src/main/res/values-it-rIT/strings_download.xml
index d6a83c8a..5b516f1d 100644
--- a/app/src/main/res/values-it-rIT/strings_download.xml
+++ b/app/src/main/res/values-it-rIT/strings_download.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-    <string name="pick_image">Scegli Immagine</string>
+    <string name="pick_image">Scegli un\'immagine</string>
     <string name="download">Download</string>
     <string name="downloading">Download in corso…</string>
-    <string name="image_download_success">Immagine salvata</string>
+    <string name="image_download_success">Immagine scaricata</string>
     <string name="image_download_fail">Errore nel salvataggio dell\'immagine</string>
     <string name="image_share_failed">Impossibile condividere l\'immagine</string>
     <string name="downloading_video">Video in Download</string>
diff --git a/app/src/main/res/values-it-rIT/strings_errors.xml b/app/src/main/res/values-it-rIT/strings_errors.xml
index 9f5df968..28ce037e 100644
--- a/app/src/main/res/values-it-rIT/strings_errors.xml
+++ b/app/src/main/res/values-it-rIT/strings_errors.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-    <string name="null_url_overlay">Ricevuto url vuoto; uscita</string>
+    <string name="null_url_overlay">L\'url ricevuto è vuoto; sto uscendo</string>
     <string name="bad_image_overlay">Impossibile caricare l\'url correttamente. Vuoi segnalarlo?</string>
     <string name="invalid_share_url">Url per la condivisione non valido</string>
     <string name="invalid_share_url_desc">Hai selezionato un blocco di testo che non è un url. Il testo è stato copiato negli appunti in modo da poterlo condividere manualmente.</string>
-    <string name="no_download_manager">Nessun Download Manager</string>
+    <string name="no_download_manager">Download Manager Mancante</string>
     <string name="no_download_manager_desc">Il download manager non è abilitato. Vuoi attivarlo per consentire il download?</string>
     <string name="error_generic">Si è verificato un errore.</string>
     <string name="video_load_failed">Impossibile caricare il video</string>
diff --git a/app/src/main/res/values-it-rIT/strings_intro.xml b/app/src/main/res/values-it-rIT/strings_intro.xml
index ca97f6a8..e49714d6 100644
--- a/app/src/main/res/values-it-rIT/strings_intro.xml
+++ b/app/src/main/res/values-it-rIT/strings_intro.xml
@@ -5,12 +5,12 @@
     <string name="intro_welcome_to_frost">Benvenuto in Frost</string>
     <string name="intro_slide_to_continue">Scorri per continuare</string>
     <string name="intro_select_theme">Seleziona un tema</string>
-    <string name="intro_multiple_accounts">Account multipli</string>
+    <string name="intro_multiple_accounts">Account Multipli</string>
     <string name="intro_multiple_accounts_desc">Aggiungi e cambia account direttamente dalla barra di navigazione.\nPremi sull\'avatar per andare sul tuo profilo.</string>
     <string name="intro_easy_navigation">Navigazione Facile</string>
-    <string name="intro_easy_navigation_desc">Scorri attraverso le visualizzazioni, e tocca l\'icona della scheda per tornare in cima.\nTocca l\'icona di nuovo per ricaricare la pagina.</string>
+    <string name="intro_easy_navigation_desc">Scorri attraverso le schermate, e tocca l\'icona della scheda per tornare in cima.\nTocca l\'icona di nuovo per ricaricare la pagina.</string>
     <string name="intro_context_aware">Consapevole del Contenuto</string>
-    <string name="intro_context_aware_desc">Premi a lungo sui link per copiarli e condividerli.\nPremi a lungo sulle immagini per ingrandirle e scaricarle.\nPremi a lungo sulle schede per lo scroll orizzontale.</string>
+    <string name="intro_context_aware_desc">Premi a lungo sui link per copiarli e condividerli. Premi a lungo sulle immagini per ingrandirle e scaricarle. Premi a lungo sulle schede per scorrerle in orizzontale.</string>
     <string name="intro_end">Iniziamo!</string>
-    <string name="intro_tap_to_exit">Tocca ovunque per continuare</string>
+    <string name="intro_tap_to_exit">Tocca ovunque per uscire</string>
 </resources>
diff --git a/app/src/main/res/values-it-rIT/strings_play_store.xml b/app/src/main/res/values-it-rIT/strings_play_store.xml
index 78148f78..e0678e95 100644
--- a/app/src/main/res/values-it-rIT/strings_play_store.xml
+++ b/app/src/main/res/values-it-rIT/strings_play_store.xml
@@ -2,6 +2,6 @@
 <!--Generated by crowdin.com-->
 <resources>
     <string name="restoring_purchases">Ripristino acquisti…</string>
-    <string name="uh_oh">Uh Oh</string>
+    <string name="uh_oh">Oh Oh</string>
     <string name="reload">Ricarica</string>
 </resources>
diff --git a/app/src/main/res/values-it-rIT/strings_pref_appearance.xml b/app/src/main/res/values-it-rIT/strings_pref_appearance.xml
index e823c6cd..16783936 100644
--- a/app/src/main/res/values-it-rIT/strings_pref_appearance.xml
+++ b/app/src/main/res/values-it-rIT/strings_pref_appearance.xml
@@ -3,22 +3,20 @@
 <resources>
     <string name="theme_customization">Personalizzazione del Tema</string>
     <string name="theme">Tema</string>
-    <string name="text_color">Colore del testo</string>
+    <string name="text_color">Colore del Testo</string>
     <string name="accent_color">Colore Secondario</string>
     <string name="background_color">Colore di Sfondo</string>
-    <string name="header_color">Colore intestazione</string>
+    <string name="header_color">Colore Intestazione</string>
     <string name="icon_color">Colore dell\'Icona</string>
     <string name="global_customization">Personalizzazione Globale</string>
-    <string name="main_activity_layout">Layout Pagina Principale</string>
-    <string name="main_activity_layout_desc">Layout Pagina Principale</string>
-    <string name="main_tabs">Schede Pagina Principale</string>
+    <string name="main_activity_layout">Layout della Pagina Principale</string>
+    <string name="main_activity_layout_desc">Imposta il Layout della Pagina Principale</string>
+    <string name="main_tabs">Schede della Pagina Principale</string>
     <string name="main_tabs_desc">Imposta quali schede visualizzare nella pagina principale</string>
-    <string name="rounded_icons">Icone Arrotondate</string>
-    <string name="rounded_icons_desc">Le immagini profilo e le conversazioni di gruppo saranno arrotondate</string>
     <string name="tint_nav">Barra di Navigazione in Tinta</string>
     <string name="tint_nav_desc">La barra di navigazione sarà dello stesso colore dell\'intestazione</string>
-    <string name="web_text_scaling">Scala del Testo</string>
-    <string name="web_text_scaling_desc">Testo di Esempio; Tieni premuta la percentuale per reimpostare.</string>
+    <string name="web_text_scaling">Ridimensionamento del Testo</string>
+    <string name="web_text_scaling_desc">Testo di Esempio; Tieni premuta la percentuale per reimpostarla.</string>
     <string name="enforce_black_media_bg">Forza lo sfondo nero nei media</string>
-    <string name="enforce_black_media_bg_desc">Imposta gli sfondi dei contenuti multimediali in nero; L\'impostazione predefinita è lo sfondo scelto sopra</string>
+    <string name="enforce_black_media_bg_desc">Imposta in nero lo sfondo dei contenuti multimediali; L\'impostazione predefinita è lo sfondo scelto sopra</string>
 </resources>
diff --git a/app/src/main/res/values-it-rIT/strings_pref_behaviour.xml b/app/src/main/res/values-it-rIT/strings_pref_behaviour.xml
index ec594643..addc6990 100644
--- a/app/src/main/res/values-it-rIT/strings_pref_behaviour.xml
+++ b/app/src/main/res/values-it-rIT/strings_pref_behaviour.xml
@@ -5,21 +5,22 @@
     <string name="fancy_animations_desc">Mostra le pagine web usando modulazioni e transizioni animate</string>
     <string name="overlay_swipe">Abilita Sovrapposizioni</string>
     <string name="overlay_swipe_desc">La maggior parte dei link si aprirà in sovrapposizione così potrai tornare facilmente alla schermata di partenza. 
-Si noti che potrebbe causare un caricamento leggermente più lungo dovuto al fatto che l\'intera pagina deve essere ricaricata.</string>
-    <string name="overlay_full_screen_swipe">Sovrapposizione a Tutto Schermo Scorri per Annullare</string>
+Potrebbe causare un caricamento leggermente più lungo in quanto l\'intera pagina viene ricaricata.</string>
+    <string name="overlay_full_screen_swipe">Scorri per Annullare la Sovrapposizione a Tutto Schermo</string>
     <string name="overlay_full_screen_swipe_desc">Scorri a destra da qualsiasi punto di una pagina web in sovrapposizione per chiudere il browser. Se disabilitato, funzionerà solo scorrendo dal bordo sinistro.</string>
     <string name="open_links_in_default">Apri i Link nell\'Applicazione di Default</string>
-    <string name="open_links_in_default_desc">Quando Possibile, apri i link nell\'applicazione di default piuttosto che attraverso le sovrapposizioni di Frost</string>
-    <string name="viewpager_swipe">Scorri tra Viewpager</string>
-    <string name="viewpager_swipe_desc">Permette di scorrere sulle pagine delle schermate principali per cambiare sezione.</string>
+    <string name="open_links_in_default_desc">Quando possibile, apri i link nell\'applicazione di default piuttosto che attraverso il browser di Frost</string>
+    <string name="viewpager_swipe">Scorri tra le Sezioni</string>
+    <string name="viewpager_swipe_desc">Permette di scorrere tra le pagine delle schermate principali per cambiare sezione. 
+Di default lo scorrimento si arresta in automatico quando premi a lungo su un oggetto, come il pulsante Mi Piace. Se disabilitato previene lo scorrimento delle pagine completamente.</string>
     <string name="search_bar">Barra di Ricerca</string>
-    <string name="search_bar_desc">Abilita la barra di ricerca al posto di un pannello ricerca sovrapposto</string>
+    <string name="search_bar_desc">Abilita la barra di ricerca al posto di un pannello ricerca in sovrapposizione</string>
     <string name="force_message_bottom">Salta all\'ultimo messaggio</string>
-    <string name="force_message_bottom_desc">Quando carichi una conversazione, si attiva uno scorrimento fino al fondo della pagina piuttosto che caricarla com\'è.</string>
+    <string name="force_message_bottom_desc">Quando carichi una conversazione, si attiva uno scorrimento fino al fondo della pagina invece di caricarla così com\'è.</string>
     <string name="enable_pip">Attiva PIP</string>
     <string name="enable_pip_desc">Attiva video in modalità picture-in-picture</string>
     <string name="exit_confirmation">Conferma Uscita</string>
     <string name="exit_confirmation_desc">Mostra un avviso prima di uscire dall\'applicazione</string>
     <string name="analytics">Statistiche</string>
-    <string name="analytics_desc">Abilita le statistiche anonime per migliorare l\'applicazione. Nessuna informazione personale sarà mai esposta.</string>
+    <string name="analytics_desc">Abilita le statistiche anonime e la segnalazione dei bug per migliorare l\'applicazione. Nessuna informazione personale sarà mai resa pubblica o esposta.</string>
 </resources>
diff --git a/app/src/main/res/values-it-rIT/strings_pref_debug.xml b/app/src/main/res/values-it-rIT/strings_pref_debug.xml
index 7ca4b985..78ccf605 100644
--- a/app/src/main/res/values-it-rIT/strings_pref_debug.xml
+++ b/app/src/main/res/values-it-rIT/strings_pref_debug.xml
@@ -3,12 +3,10 @@
 <resources>
     <string name="debug_toast_enabled">La sezione debugging è attiva! Torna indietro alle impostazioni.</string>
     <string name="debug_toast_already_enabled">La sezione debugging è già attiva. Torna alle impostazioni.</string>
-    <string name="debug_disclaimer_info">Nonostante la maggior parte del contenuto privato sia stato rimosso automaticamente dal bug report, alcune informazioni personali potrebbero essere ancora visibili.
-
-Per favore dai un\'occhiata al report prima di inviarlo.
-
-
-Cliccando su una delle opzioni sottostanti preparerà un\'email con i dati della schermata.    </string>
+    <string name="debug_disclaimer_info">Nonostante la maggior parte del contenuto privato sia stato rimosso automaticamente dal rapporto dei bug, alcune informazioni personali potrebbero essere ancora visibili.
+        \nPer favore dai un\'occhiata al rapporto prima di inviarlo.
+        \n\nCliccando su una delle opzioni sottostanti verrà preparata un\'email con i dati della schermata.
+    </string>
     <string name="debug_incomplete">Report incompleto</string>
     <string name="debug_web">Debug dal Web</string>
     <string name="debug_web_desc">Naviga alla pagina con il problema e invia dati per il debug.</string>
diff --git a/app/src/main/res/values-it-rIT/strings_pref_experimental.xml b/app/src/main/res/values-it-rIT/strings_pref_experimental.xml
index fdcc5758..46aa21e0 100644
--- a/app/src/main/res/values-it-rIT/strings_pref_experimental.xml
+++ b/app/src/main/res/values-it-rIT/strings_pref_experimental.xml
@@ -2,11 +2,11 @@
 <!--Generated by crowdin.com-->
 <resources>
     <string name="experimental_disclaimer">Disclaimer</string>
-    <string name="experimental_disclaimer_info">Le funzioni sperimentali potrebbero essere instabili e potrebbero non giungere mai al rilascio. Usale a tuo rischio, manda il tuo feedback e sentiti libero di disabilitarle se non funzionano bene.</string>
-    <string name="experimental_by_default">Experimental di Default</string>
+    <string name="experimental_disclaimer_info">Le funzioni sperimentali potrebbero essere instabili e potrebbero non arrivare mai al rilascio. Usale a tuo rischio e pericolo, manda il tuo feedback e sentiti libero di disabilitarle se non funzionano bene.</string>
+    <string name="experimental_by_default">Funzioni Sperimentali di Default</string>
     <string name="experimental_by_default_desc">Ti senti temerario o vuoi solo aiutarci con il debugging? Attivandolo abiliterai le funzioni sperimentali di default.</string>
-    <string name="verbose_logging">Log Dettagliato</string>
-    <string name="verbose_logging_desc">Abilita log dettagliati per aiutare con il report dei crash. Il log verrà mandato solamente quando verrà riscontrato un errore, quindi ricrea la situazione per evidenziare la dev. Verrà automaticamente disattivato se si riavvia l\'applicazione.</string>
+    <string name="verbose_logging">Log Dettagliati</string>
+    <string name="verbose_logging_desc">Abilita log dettagliati per aiutare con il rapporto dei crash. Il log verrà mandato solamente quando verrà riscontrato un errore, quindi ricrea la situazione per notificare gli sviluppatori. Verrà automaticamente disattivato se si riavvia l\'applicazione.</string>
     <string name="restart_frost">Riavvia Frost</string>
     <string name="restart_frost_desc">Riavvia l\'applicazione a freddo.</string>
 </resources>
diff --git a/app/src/main/res/values-it-rIT/strings_pref_feed.xml b/app/src/main/res/values-it-rIT/strings_pref_feed.xml
index 3794b024..0be04d34 100644
--- a/app/src/main/res/values-it-rIT/strings_pref_feed.xml
+++ b/app/src/main/res/values-it-rIT/strings_pref_feed.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-    <string name="newsfeed_sort">Ordine notizie</string>
+    <string name="newsfeed_sort">Ordine della Sezione Notizie</string>
     <string name="newsfeed_sort_desc">Scegli in che ordine visualizzare i post</string>
-    <string name="aggressive_recents">Recenti Aggressivi</string>
-    <string name="aggressive_recents_desc">Filtra ulteriori post vecchi dalla sezione originale più recenti di Facebook. Disabilita se il tuo feed è vuoto.</string>
+    <string name="aggressive_recents">Modalità \"Recenti\" Aggressiva</string>
+    <string name="aggressive_recents_desc">Filtra ulteriori post vecchi dalla sezione originale dei post più recenti di Facebook. Disabilita se il tuo feed è vuoto.</string>
     <string name="composer">Compositore di Stato</string>
     <string name="composer_desc">Mostra la casella per comporre uno stato nelle Notizie</string>
-    <string name="suggested_friends">Amici consigliati</string>
+    <string name="suggested_friends">Amici Suggeriti</string>
     <string name="suggested_friends_desc">Mostra \"Persone che potresti conoscere\" nelle notizie</string>
     <string name="suggested_groups">Gruppi suggeriti</string>
     <string name="suggested_groups_desc">Mostra \"Gruppi suggeriti\" nelle notizie</string>
+    <string name="show_stories">Mostra le Storie</string>
+    <string name="show_stories_desc">Mostra le storie nella sezione Notizie</string>
     <string name="facebook_ads">Pubblicità</string>
     <string name="facebook_ads_desc">Mostra le pubblicità native di Facebook</string>
 </resources>
diff --git a/app/src/main/res/values-it-rIT/strings_pref_networks.xml b/app/src/main/res/values-it-rIT/strings_pref_networks.xml
index a3109843..7e9d79d6 100644
--- a/app/src/main/res/values-it-rIT/strings_pref_networks.xml
+++ b/app/src/main/res/values-it-rIT/strings_pref_networks.xml
@@ -2,5 +2,5 @@
 <!--Generated by crowdin.com-->
 <resources>
     <string name="network_media_on_metered">Disabilita le immagini su reti a consumo.</string>
-    <string name="network_media_on_metered_desc">Se rilevata una connessione a consumo, Frost non caricherà nessun immagine o video.</string>
+    <string name="network_media_on_metered_desc">Se viene rilevata una connessione a consumo, Frost non caricherà nessun\'immagine o video.</string>
 </resources>
diff --git a/app/src/main/res/values-it-rIT/strings_pref_notifications.xml b/app/src/main/res/values-it-rIT/strings_pref_notifications.xml
index 41aef462..52328f6c 100644
--- a/app/src/main/res/values-it-rIT/strings_pref_notifications.xml
+++ b/app/src/main/res/values-it-rIT/strings_pref_notifications.xml
@@ -4,9 +4,9 @@
     <string name="notification_frequency">Frequenza delle notifiche</string>
     <string name="no_notifications">Nessuna notifica</string>
     <string name="notification_keywords">Parole chiave</string>
-    <string name="notification_keywords_desc">Non mostrare quando la notifica contiene qualcuna delle seguenti parole.</string>
+    <string name="notification_keywords_desc">Non mostrare una notifica quando contiene qualcuna delle seguenti parole.</string>
     <string name="add_keyword">Aggiungi parole chiave</string>
-    <string name="hint_keyword">Scrivi la parola e premi +</string>
+    <string name="hint_keyword">Scrivi la parola chiave e premi +</string>
     <string name="empty_keyword">Parola Chiave Vuota</string>
     <string name="notification_general">Abilita notifiche generali</string>
     <string name="notification_general_desc">Ricevi notifiche generali per il tuo account.</string>
@@ -17,12 +17,12 @@
     <string name="notification_messages_all_accounts">Notifica messaggi da tutti gli account</string>
     <string name="notification_messages_all_accounts_desc">Ricevi notifiche di messaggio immediate da tutti gli account</string>
     <string name="notification_fetch_now">Recupera le notifiche ora</string>
-    <string name="notification_fetch_now_desc">Avvia il recupero delle notifiche attuali.</string>
+    <string name="notification_fetch_now_desc">Avvia il recupero delle notifiche, una singola volta.</string>
     <string name="notification_fetch_success">Recupero le notifiche…</string>
     <string name="notification_fetch_fail">Impossibile recuperare le notifiche</string>
-    <string name="notification_sound">Suono notifiche</string>
+    <string name="notification_sound">Suono di notifica</string>
     <string name="notification_channel">Personalizza i canali di notifica</string>
-    <string name="notification_channel_desc">Modifica il suono, la vibrazione, le priorità ecc</string>
+    <string name="notification_channel_desc">Modifica il suono, la vibrazione, le priorità, eccetera</string>
     <string name="notification_ringtone">Suoneria della Notifica</string>
     <string name="message_ringtone">Suoneria dei messaggi</string>
     <string name="select_ringtone">Seleziona Suoneria</string>
diff --git a/app/src/main/res/values-it-rIT/strings_preferences.xml b/app/src/main/res/values-it-rIT/strings_preferences.xml
index ef46de4f..764f3902 100644
--- a/app/src/main/res/values-it-rIT/strings_preferences.xml
+++ b/app/src/main/res/values-it-rIT/strings_preferences.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-    <string name="appearance">Apparenza</string>
-    <string name="appearance_desc">Temi, oggetti da mostrare, etc</string>
-    <string name="notifications_desc">Frequenza, filtri, suonerie, etc</string>
-    <string name="newsfeed">News Feed</string>
-    <string name="newsfeed_desc">Stabilisci quali item appaiono nelle News Feed</string>
+    <string name="appearance">Aspetto</string>
+    <string name="appearance_desc">Temi, oggetti da mostrare, eccetera</string>
+    <string name="notifications_desc">Frequenza, filtri, suonerie, eccetera</string>
+    <string name="newsfeed">Sezione Notizie</string>
+    <string name="newsfeed_desc">Stabilisci quali oggetti appaiono nella sezione notizie</string>
     <string name="behaviour">Comportamento</string>
-    <string name="behaviour_desc">Stabilisci come l\'applicazione agisce in certe impostazioni</string>
+    <string name="behaviour_desc">Stabilisci come l\'applicazione agisce in certe situazioni</string>
     <string name="network">Rete</string>
     <string name="network_desc">Definisci le opzioni che influiscono sulle reti a consumo</string>
-    <string name="experimental">Sperimentali</string>
+    <string name="experimental">Funzioni Sperimentali</string>
     <string name="experimental_desc">Abilita accesso a delle funzionalità potenzialmente pericolose</string>
     <string name="about_frost">Riguardo Frost per Facebook</string>
-    <string name="about_frost_desc">Versione, Credite e FAQ</string>
+    <string name="about_frost_desc">Versione, Riconoscimenti e FAQ</string>
     <string name="help_translate">Aiuta a Tradurre</string>
-    <string name="help_translate_desc">Frost è tradotto attraverso la crowdin. Contribuisci, se lo vuoi nella tua lingua!</string>
+    <string name="help_translate_desc">Frost è tradotto attraverso Crowdin. Contribuisci se lo vuoi nella tua lingua!</string>
     <string name="debug_frost">Frost debugger</string>
     <string name="debug_frost_desc">Invia dati html per aiutare con il debug.</string>
     <string name="replay_intro">Riesegui introduzione</string>
diff --git a/app/src/main/res/values-it-rIT/strings_web_context.xml b/app/src/main/res/values-it-rIT/strings_web_context.xml
index 589f0829..586ad067 100644
--- a/app/src/main/res/values-it-rIT/strings_web_context.xml
+++ b/app/src/main/res/values-it-rIT/strings_web_context.xml
@@ -3,7 +3,7 @@
 <resources>
     <string name="share_link">Condividi link</string>
     <string name="debug_link">Link debug</string>
-    <string name="debug_link_desc">Se un collegamento non è caricato correttamente, puoi inviarmi una e-mail affinché possa aiutarmi a eseguire il debug. Facendo clic su Ok apri una richiesta di posta elettronica</string>
+    <string name="debug_link_desc">Se un collegamento non è caricato correttamente, puoi inviarmi una e-mail affinché possa aiutare a eseguire il debug. Facendo clic su Ok si apre una richiesta di posta elettronica</string>
     <string name="open_link">Apri link</string>
     <string name="copy_link">Copia link</string>
     <string name="copy_text">Copia testo</string>
diff --git a/app/src/main/res/values-ko-rKR/strings_pref_appearance.xml b/app/src/main/res/values-ko-rKR/strings_pref_appearance.xml
index e3dc9293..84aed31a 100644
--- a/app/src/main/res/values-ko-rKR/strings_pref_appearance.xml
+++ b/app/src/main/res/values-ko-rKR/strings_pref_appearance.xml
@@ -10,8 +10,6 @@
     <string name="icon_color">아이콘 색상</string>
     <string name="global_customization">전역 사용자 지정</string>
     <string name="main_activity_layout">주 액티비티 구성</string>
-    <string name="rounded_icons">원형 아이콘</string>
-    <string name="rounded_icons_desc">프로필 사진과 그룹 대화 아이콘이 둥글어 집니다.</string>
     <string name="tint_nav">내비게이션 바 색상</string>
     <string name="tint_nav_desc">내비게이션 바가 헤더와 동일한 색상이 됩니다.</string>
     <string name="web_text_scaling">웹 텍스트 크기</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
new file mode 100644
index 00000000..5a0373f7
--- /dev/null
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+    <string name="feed">Nieuwsfeed</string>
+    <string name="most_recent">Meest recent</string>
+    <string name="top_stories">Verhalen</string>
+    <string name="profile">Profiel</string>
+    <string name="bookmarks">Favorieten</string>
+    <string name="events">Evenementen</string>
+    <string name="friends">Vrienden</string>
+    <string name="messages">Berichten</string>
+    <string name="notifications">Notificaties</string>
+    <string name="activity_log">Activiteitenlogboek</string>
+    <string name="pages">Pagina\'s</string>
+    <string name="groups">Groepen</string>
+    <string name="saved">Opgeslagen</string>
+    <string name="birthdays">Verjaardagen</string>
+    <string name="chat">Chat</string>
+    <string name="photos">Foto\'s</string>
+    <string name="marketplace">Marketplace</string>
+    <string name="notes">Notities</string>
+    <string name="on_this_day">Op deze dag</string>
+    <string name="loading_account">Voorbereiden account…</string>
+    <string name="welcome">Welkom %s</string>
+    <string name="select_facebook_account">Selecteer een Facebook-account</string>
+    <string name="account_not_found">Het huidige account is niet opgeslagen in de database</string>
+    <string name="frost_requests">Frost Verzoeken</string>
+    <string name="frost_notifications">Frost Notificaties</string>
+    <string name="requires_custom_theme">Aangepast thema vereist</string>
+    <string name="subject">Onderwerp</string>
+    <string name="share">Delen</string>
+    <string name="web_overlay_swipe_hint">Veeg naar rechts om terug te gaan naar het vorige venster.</string>
+    <string name="profile_picture">Profielfoto</string>
+    <string name="new_message">Nieuw bericht</string>
+    <string name="no_text">Geen tekst</string>
+    <string name="show_all_results">Alle resultaten</string>
+    <string name="frost_description">Frost is een open-source en volledig functioneel alternatief voor de officiële Facebook-app met aan te passen thema\'s.</string>
+    <string name="faq_title">Frost Veelgestelde Vragen</string>
+    <string name="html_extraction_error">Fout opgetreden bij het verwerken van de HTML-code.</string>
+    <string name="html_extraction_cancelled">De aanvraag werd geannuleerd.</string>
+    <string name="html_extraction_timeout">De aanvraag is verlopen.</string>
+    <string name="file_chooser_not_found">Geen bestandskiezer gevonden</string>
+    <string name="top_bar">Werkbalk bovenaan</string>
+    <string name="bottom_bar">Werkbalk onderaan</string>
+    <string name="preview">Voorbeeld</string>
+    <string name="options">Opties</string>
+    <string name="tab_customizer_instructions">Klik en houd vast om de iconen in de gewenste volgorde te slepen.</string>
+    <string name="no_new_notifications">Geen nieuwe notificaties</string>
+</resources>
diff --git a/app/src/main/res/values-nl-rNL/strings_download.xml b/app/src/main/res/values-nl-rNL/strings_download.xml
new file mode 100644
index 00000000..bdc56c19
--- /dev/null
+++ b/app/src/main/res/values-nl-rNL/strings_download.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+    <string name="pick_image">Kies afbeelding</string>
+    <string name="download">Downloaden</string>
+    <string name="downloading">Downloaden…</string>
+    <string name="image_download_success">Afbeelding gedownload</string>
+    <string name="image_download_fail">Fout bij downloaden afbeelding</string>
+    <string name="image_share_failed">Fout bij delen van afbeelding</string>
+    <string name="downloading_video">Video downloaden</string>
+    <string name="downloaded_video">Video gedownload</string>
+    <string name="downloading_file">Bestand downloaden</string>
+    <string name="downloaded_file">Bestand gedownload</string>
+    <string name="error_invalid_download">Ongeldig downloadverzoek</string>
+</resources>
diff --git a/app/src/main/res/values-nl-rNL/strings_errors.xml b/app/src/main/res/values-nl-rNL/strings_errors.xml
new file mode 100644
index 00000000..a5aedb6d
--- /dev/null
+++ b/app/src/main/res/values-nl-rNL/strings_errors.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+    <string name="no_download_manager">Geen download manager</string>
+    <string name="no_download_manager_desc">De download manager is niet ingeschakeld, downloaden is niet mogelijk. Nu inschakelen?</string>
+    <string name="error_generic">Fout opgetreden.</string>
+    <string name="video_load_failed">Video laden mislukt</string>
+    <string name="error_notification">Fout opgetreden bij het laden van de notificaties</string>
+    <string name="error_sdk">De SDK (%d) van dit apparaat wordt niet ondersteund. Frost draait alleen op Lollipop (SDK 21) en hoger</string>
+    <string name="error_webview">Kan geen WebView op dit apparaat vinden. Voeg een WebView rendering engine toe of schakel de beschikbare WebView in.</string>
+</resources>
diff --git a/app/src/main/res/values-nl-rNL/strings_intro.xml b/app/src/main/res/values-nl-rNL/strings_intro.xml
new file mode 100644
index 00000000..685a54e8
--- /dev/null
+++ b/app/src/main/res/values-nl-rNL/strings_intro.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+    <string name="skip">Overslaan</string>
+    <string name="intro_welcome_to_frost">Welkom bij Frost</string>
+    <string name="intro_slide_to_continue">Veeg om verder te gaan</string>
+    <string name="intro_select_theme">Selecteer een thema</string>
+    <string name="intro_multiple_accounts">Meerdere accounts</string>
+    <string name="intro_multiple_accounts_desc">Voeg meerdere accounts toe en wissel direct tussen de accounts via de navigatiebalk.\nKlik op de profielfoto om het profiel te bekijken.</string>
+    <string name="intro_easy_navigation">Gemakkelijk navigeren</string>
+    <string name="intro_easy_navigation_desc">Verwissel van weergave met veeggebaren en klik op de tabs om direct naar boven te scrollen.\nKlik nogmaals op de tab om de pagina te verversen.</string>
+    <string name="intro_context_aware">Contextafhankelijke acties</string>
+    <string name="intro_context_aware_desc">Druk lang op links om deze te kopiëren en te delen.\nDruk lang op afbeeldingen om te zoomen en te downloaden.\nDruk lang op collages om horizontaal te kunnen scrollen.</string>
+    <string name="intro_end">Nu beginnen!</string>
+    <string name="intro_tap_to_exit">Klik op het scherm om de introductie te sluiten</string>
+</resources>
diff --git a/app/src/main/res/values-nl-rNL/strings_play_store.xml b/app/src/main/res/values-nl-rNL/strings_play_store.xml
new file mode 100644
index 00000000..7236fa62
--- /dev/null
+++ b/app/src/main/res/values-nl-rNL/strings_play_store.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!--Generated by crowdin.com-->
+<resources>
+    <string name="restoring_purchases">Aankopen herstellen…</string>
+    <string name="uh_oh">Oeps</string>
+    <string name="reload">Opnieuw laden</string>
+</resources>
diff --git a/app/src/main/res/values-nl-rNL/strings_pref_appearance.xml b/app/src/main/res/values-nl-rNL/strings_pref_appearance.xml
new file mode 100644
index 00000000..df5216be
--- /dev/null
+++ b/app/src/main/res/values-nl-rNL/strings_pref_appearance.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+    <string name="theme_customization">Thema aanpassen</string>
+    <string name="theme">Thema</string>
+    <string name="text_color">Tekstkleur</string>
+    <string name="accent_color">Accentkleur</string>
+    <string name="background_color">Achtergrondkleur</string>
+    <string name="header_color">Kleur koptekst</string>
+    <string name="icon_color">Kleur iconen</string>
+    <string name="global_customization">Algemene aanpassingen</string>
+    <string name="main_activity_layout">Layout hoofdscherm</string>
+    <string name="main_activity_layout_desc">Stel de layout voor het hoofdscherm in</string>
+    <string name="main_tabs">Tabs hoofdscherm</string>
+    <string name="main_tabs_desc">Pas aan welke tabs zichtbaar zijn in het hoofdscherm</string>
+    <string name="tint_nav">Navigatiebalk kleuren</string>
+    <string name="tint_nav_desc">Geef de navigatiebalk dezelfde kleur als de kop</string>
+    <string name="web_text_scaling">Tekst schalen</string>
+    <string name="web_text_scaling_desc">Voorbeeld geschaalde tekst. Druk lang op het percentage om te resetten.</string>
+    <string name="enforce_black_media_bg">Zwarte achtergrond voor media forceren</string>
+    <string name="enforce_black_media_bg_desc">Maak de achtergronden voor afbeeldingen en video\'s zwart. Standaard wordt de hierboven geselecteerde achtergrond getoond</string>
+</resources>
diff --git a/app/src/main/res/values-nl-rNL/strings_pref_behaviour.xml b/app/src/main/res/values-nl-rNL/strings_pref_behaviour.xml
new file mode 100644
index 00000000..bc8bdb9c
--- /dev/null
+++ b/app/src/main/res/values-nl-rNL/strings_pref_behaviour.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+    <string name="fancy_animations">Animaties</string>
+    <string name="fancy_animations_desc">Toon animaties bij het openen van pagina\'s</string>
+    <string name="overlay_swipe">Overlays inschakelen</string>
+    <string name="overlay_swipe_desc">Open links in een nieuwe laag, zodat het (via een veeggebaar) terugkeren naar de vorige pagina wordt vergemakkelijkt. Wel zal dit de laadtijd iets vergroten, omdat de gehele pagina opnieuw zal worden ingeladen.</string>
+    <string name="overlay_full_screen_swipe">Veeggebaar voor sluiten over gehele scherm</string>
+    <string name="overlay_full_screen_swipe_desc">Gebruik overal op het scherm het veeggebaar naar rechts om de browser te sluiten. Indien uitgeschakeld zal alleen het vegen vanaf de linkerrand werken.</string>
+    <string name="open_links_in_default">Links in standaard app openen</string>
+    <string name="open_links_in_default_desc">Open links indien mogelijk in de standaard app in plaats van binnen Frost</string>
+    <string name="viewpager_swipe">Met veeggebaren navigeren</string>
+    <string name="viewpager_swipe_desc">Wissel tussen tabs met veeggebaren. Het vegen zal automatisch stoppen bij het lang inhouden van een item, zoals de Like-knop. Schakel dit uit om veeggebaren tussen pagina\'s te voorkomen.</string>
+    <string name="search_bar">Zoekbalk</string>
+    <string name="search_bar_desc">Toon een zoekbalk in plaats van een zwevend zoekveld</string>
+    <string name="force_message_bottom">Naar laatste bericht scrollen</string>
+    <string name="force_message_bottom_desc">Scroll bij het bekijken van berichten automatisch naar het laatste bericht (onderaan).</string>
+    <string name="enable_pip">PIP inschakelen</string>
+    <string name="enable_pip_desc">Toon video\'s Picture-in-Picture</string>
+    <string name="exit_confirmation">Afsluiten bevestigen</string>
+    <string name="exit_confirmation_desc">Vraag om bevestiging bij het afsluiten van de app</string>
+    <string name="analytics">Statistieken</string>
+    <string name="analytics_desc">Schakel anonieme statistieken en foutrapporten in om mee te helpen met de ontwikkeling van de app. Persoonlijke informatie zal nooit worden doorgestuurd.</string>
+</resources>
diff --git a/app/src/main/res/values-nl-rNL/strings_pref_debug.xml b/app/src/main/res/values-nl-rNL/strings_pref_debug.xml
new file mode 100644
index 00000000..96f18777
--- /dev/null
+++ b/app/src/main/res/values-nl-rNL/strings_pref_debug.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+    <string name="debug_toast_enabled">Debugging is ingeschakeld! Keer terug naar de instellingen.</string>
+    <string name="debug_toast_already_enabled">Debugging is reeds ingeschakeld. Keer terug naar de instellingen.</string>
+    <string name="debug_disclaimer_info">De meeste privacygevoelige informatie automatisch verwijderd wordt uit het rapport, maar het kan voorkomen dat sommige gevoelige informatie zichtbaar blijft.
+        \nControleer zelf voor het verzenden of het rapport nog aangepast dient te worden.
+        \n\nKlik op een van de onderstaande opties om een e-mail met de gegeven van de webpagina op te stellen.
+    </string>
+    <string name="debug_incomplete">Rapport onvolledig</string>
+    <string name="debug_web">Webpagina debuggen</string>
+    <string name="debug_web_desc">Navigeer naar de pagina met het probleem en stuur de gegevens op voor debugging.</string>
+    <string name="parsing_data">Gegevens verwerken</string>
+    <string name="debug_parsers">Parsers debuggen</string>
+    <string name="debug_parsers_desc">Start een van de beschikbare parsers om de verwerkte gegevens te debuggen</string>
+</resources>
diff --git a/app/src/main/res/values-nl-rNL/strings_pref_experimental.xml b/app/src/main/res/values-nl-rNL/strings_pref_experimental.xml
new file mode 100644
index 00000000..d48c488d
--- /dev/null
+++ b/app/src/main/res/values-nl-rNL/strings_pref_experimental.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+    <string name="experimental_disclaimer">Disclaimer</string>
+    <string name="experimental_disclaimer_info">Experimentele functies kunnen instabiliteit veroorzaken en zullen mogelijk nooit volledig worden geïmplementeerd. Gebruik de functies op eigen verantwoordelijkheid, stuur feedback en wees vrij om ze uit te schakelen bij problemen.</string>
+    <string name="experimental_by_default">Experimentele functies standaard inschakelen</string>
+    <string name="experimental_by_default_desc">Wees een waaghals en activeer nieuwe experimentele functies automatisch.</string>
+    <string name="verbose_logging">Uitgebreide logging</string>
+    <string name="verbose_logging_desc">Schakel uitgebreide logging in om te helpen met crashrapporten. Logs worden alleen doorgestuurd bij fouten, dus herhaal de stappen die het probleem veroorzaken om de ontwikkelaar op de hoogte te brengen. Deze optie wordt automatisch uitgeschakeld bij een herstart van de app.</string>
+    <string name="restart_frost">Frost herstarten</string>
+    <string name="restart_frost_desc">Initieer een volledige herstart van de app.</string>
+</resources>
diff --git a/app/src/main/res/values-nl-rNL/strings_pref_feed.xml b/app/src/main/res/values-nl-rNL/strings_pref_feed.xml
new file mode 100644
index 00000000..1aa761cf
--- /dev/null
+++ b/app/src/main/res/values-nl-rNL/strings_pref_feed.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+    <string name="newsfeed_sort">Volgorde in nieuwsfeed</string>
+    <string name="newsfeed_sort_desc">Bepaal de volgorde van de berichten</string>
+    <string name="aggressive_recents">Uitsluitend meest recent</string>
+    <string name="aggressive_recents_desc">Verberg oude berichten die toch door Facebook tussen de meest recente berichten worden geplaatst. Schakel deze optie uit als de nieuwsfeed leeg blijft.</string>
+    <string name="composer">Statusveld</string>
+    <string name="composer_desc">Toon een veld in de nieuwsfeed om je status in op te geven</string>
+    <string name="suggested_friends">Suggesties voor vrienden</string>
+    <string name="suggested_friends_desc">Toon \"Mensen die je misschien kent\" in de nieuwsfeed</string>
+    <string name="suggested_groups">Suggesties voor groepen</string>
+    <string name="suggested_groups_desc">Toon suggesties voor groepen in de nieuwsfeed</string>
+    <string name="facebook_ads">Facebook-advertenties</string>
+    <string name="facebook_ads_desc">Toon de advertenties van Facebook</string>
+</resources>
diff --git a/app/src/main/res/values-nl-rNL/strings_pref_networks.xml b/app/src/main/res/values-nl-rNL/strings_pref_networks.xml
new file mode 100644
index 00000000..cfa0789d
--- /dev/null
+++ b/app/src/main/res/values-nl-rNL/strings_pref_networks.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+    <string name="network_media_on_metered">Afbeeldingen uitschakelen bij verbinding met datalimiet.</string>
+    <string name="network_media_on_metered_desc">Download geen afbeeldingen en video\'s indien de verbinding een datalimiet heeft.</string>
+</resources>
diff --git a/app/src/main/res/values-nl-rNL/strings_pref_notifications.xml b/app/src/main/res/values-nl-rNL/strings_pref_notifications.xml
new file mode 100644
index 00000000..643eab00
--- /dev/null
+++ b/app/src/main/res/values-nl-rNL/strings_pref_notifications.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+    <string name="notification_frequency">Interval notificaties</string>
+    <string name="no_notifications">Geen notificaties</string>
+    <string name="notification_keywords">Trefwoorden</string>
+    <string name="notification_keywords_desc">Toon geen notificaties die een van de opgegeven trefwoorden bevatten.</string>
+    <string name="add_keyword">Trefwoord toevoegen</string>
+    <string name="hint_keyword">Typ een woord en druk op +</string>
+    <string name="empty_keyword">Leeg trefwoord</string>
+    <string name="notification_general">Algemene notificaties inschakelen</string>
+    <string name="notification_general_desc">Toon algemene notificaties voor het huidige account.</string>
+    <string name="notification_general_all_accounts">Algemene notificaties voor alle accounts</string>
+    <string name="notification_general_all_accounts_desc">Toon algemene notificaties voor alle ingelogde accounts.</string>
+    <string name="notification_messages">Notifications voor berichten</string>
+    <string name="notification_messages_desc">Toon notificaties voor berichten op het huidige account.</string>
+    <string name="notification_messages_all_accounts">Notificaties voor berichten van alle accounts</string>
+    <string name="notification_messages_all_accounts_desc">Toon notificaties voor berichten van alle accounts</string>
+    <string name="notification_fetch_now">Notificaties ophalen</string>
+    <string name="notification_fetch_now_desc">Haal nu eenmalig notificaties op.</string>
+    <string name="notification_fetch_success">Notificaties ophalen…</string>
+    <string name="notification_fetch_fail">Kon geen notificaties ophalen</string>
+    <string name="notification_sound">Geluid voor notificaties</string>
+    <string name="notification_channel">Geluid voor notificaties kiezen</string>
+    <string name="notification_channel_desc">Pas geluid, trillen, prioriteit etc. aan</string>
+    <string name="notification_ringtone">Geluid voor notificaties</string>
+    <string name="message_ringtone">Geluid voor berichten</string>
+    <string name="select_ringtone">Kies geluid</string>
+    <string name="notification_vibrate">Trillen bij notificaties</string>
+    <string name="notification_lights">Licht bij notificaties</string>
+</resources>
diff --git a/app/src/main/res/values-nl-rNL/strings_preferences.xml b/app/src/main/res/values-nl-rNL/strings_preferences.xml
new file mode 100644
index 00000000..aff0991a
--- /dev/null
+++ b/app/src/main/res/values-nl-rNL/strings_preferences.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+    <string name="appearance">Uiterlijk</string>
+    <string name="appearance_desc">Thema, te tonen items, etc</string>
+    <string name="notifications_desc">Interval, filters, geluiden, etc</string>
+    <string name="newsfeed">Nieuwsfeed</string>
+    <string name="newsfeed_desc">Bepaal welke berichten in de nieuwsfeed verschijnen</string>
+    <string name="behaviour">Werking</string>
+    <string name="behaviour_desc">Pas voor bepaalde gevallen de werking van de app aan</string>
+    <string name="network">Netwerk</string>
+    <string name="network_desc">Kies het gedrag bij verbindingen met een datalimiet</string>
+    <string name="experimental">Experimentele functies</string>
+    <string name="experimental_desc">Schakel experimentele en mogelijk instabiele functies in</string>
+    <string name="about_frost">Over Frost voor Facebook</string>
+    <string name="about_frost_desc">Versie, credits en veelgestelde vragen</string>
+    <string name="help_translate">Vertalen</string>
+    <string name="help_translate_desc">Frost wordt vertaald via Crowdin. Help mee met vertalen!</string>
+    <string name="debug_frost">Frost Debuggen</string>
+    <string name="debug_frost_desc">Stuur HTML-gegevens om te helpen met debuggen.</string>
+    <string name="replay_intro">Introductie opnieuw starten</string>
+</resources>
diff --git a/app/src/main/res/values-nl-rNL/strings_web_context.xml b/app/src/main/res/values-nl-rNL/strings_web_context.xml
new file mode 100644
index 00000000..343cc323
--- /dev/null
+++ b/app/src/main/res/values-nl-rNL/strings_web_context.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+    <string name="share_link">Link delen</string>
+    <string name="debug_link">Link debuggen</string>
+    <string name="debug_link_desc">Indien een link niet correct geladen wordt, kunt u me een e-mail sturen zodat ik kan helpen. Klik op OK om een e-mail op te stellen</string>
+    <string name="open_link">Link openen</string>
+    <string name="copy_link">Link kopiëren</string>
+    <string name="copy_text">Tekst kopiëren</string>
+</resources>
diff --git a/app/src/main/res/values-no-rNO/strings_pref_appearance.xml b/app/src/main/res/values-no-rNO/strings_pref_appearance.xml
index 03cdb8aa..1225d53f 100644
--- a/app/src/main/res/values-no-rNO/strings_pref_appearance.xml
+++ b/app/src/main/res/values-no-rNO/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Angi aktivitets oppsett</string>
     <string name="main_tabs">Aktivitetsfaner</string>
     <string name="main_tabs_desc">Tilpass hvilke faner som vises i din aktivitet</string>
-    <string name="rounded_icons">Avrundet ikoner</string>
-    <string name="rounded_icons_desc">Profilbilder og gruppe samtale-ikoner avrundes</string>
     <string name="tint_nav">Fargetone navigasjonslinje</string>
     <string name="tint_nav_desc">Navigasjonslinjen vil være samme farge som overskrifslinjen</string>
     <string name="web_text_scaling">Web tekst skalering</string>
diff --git a/app/src/main/res/values-pl-rPL/strings_pref_appearance.xml b/app/src/main/res/values-pl-rPL/strings_pref_appearance.xml
index bfd0565b..7fae405c 100644
--- a/app/src/main/res/values-pl-rPL/strings_pref_appearance.xml
+++ b/app/src/main/res/values-pl-rPL/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Ustaw układ aktywności</string>
     <string name="main_tabs">Karty aktywności</string>
     <string name="main_tabs_desc">Dostosuj, które karty pojawią się w Twojej aktywności</string>
-    <string name="rounded_icons">Okrągłe ikony</string>
-    <string name="rounded_icons_desc">Zdjęcia profilowe i ikony konwersacji grupowych zostaną zaokrąglone</string>
     <string name="tint_nav">Koloruj pasek nawigacji</string>
     <string name="tint_nav_desc">Pasek nawigacyjny będzie miał taki sam kolor jak nagłówek</string>
     <string name="web_text_scaling">Skalowanie tekstu</string>
diff --git a/app/src/main/res/values-pt-rBR/strings_pref_appearance.xml b/app/src/main/res/values-pt-rBR/strings_pref_appearance.xml
index 5bea9f6f..b67c4eff 100644
--- a/app/src/main/res/values-pt-rBR/strings_pref_appearance.xml
+++ b/app/src/main/res/values-pt-rBR/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Define o layout das abas principais</string>
     <string name="main_tabs">Layout das abas principais</string>
     <string name="main_tabs_desc">Personalize quais abas você verá em sua aba principal</string>
-    <string name="rounded_icons">Ícones Arredondados</string>
-    <string name="rounded_icons_desc">Fotos de perfil e ícones de conversas em grupo serão arredondados</string>
     <string name="tint_nav">Cor da Barra de Navegação</string>
     <string name="tint_nav_desc">A barra de navegação será da mesma cor que o cabeçalho</string>
     <string name="web_text_scaling">Escala de Texto da Web</string>
diff --git a/app/src/main/res/values-pt-rPT/strings_pref_appearance.xml b/app/src/main/res/values-pt-rPT/strings_pref_appearance.xml
index 4300a777..4ac01ace 100644
--- a/app/src/main/res/values-pt-rPT/strings_pref_appearance.xml
+++ b/app/src/main/res/values-pt-rPT/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Definir o esquema da atividade principal</string>
     <string name="main_tabs">Separadores da atividade</string>
     <string name="main_tabs_desc">Personalizar os separadores a mostrar na atividade principal</string>
-    <string name="rounded_icons">Ícones redondos</string>
-    <string name="rounded_icons_desc">Utilizar ícones redondos para as conversas de grupo e para a fotografia do perfil</string>
     <string name="tint_nav">Colorir barra de navegação</string>
     <string name="tint_nav_desc">Barra de navegação será da mesma cor que o cabeçalho</string>
     <string name="web_text_scaling">Escala do texto</string>
diff --git a/app/src/main/res/values-ro-rRO/strings_pref_appearance.xml b/app/src/main/res/values-ro-rRO/strings_pref_appearance.xml
index 522f7380..3dfcbbd7 100644
--- a/app/src/main/res/values-ro-rRO/strings_pref_appearance.xml
+++ b/app/src/main/res/values-ro-rRO/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Setează schema activității principale</string>
     <string name="main_tabs">Tab-urile activității principale</string>
     <string name="main_tabs_desc">Personalizează ce tab-uri vei vedea in activitatea ta principală</string>
-    <string name="rounded_icons">Iconițe rotunjite</string>
-    <string name="rounded_icons_desc">Fotografiile de profil şi pictogramele conversaţiilor de grup vor fi rotunjite</string>
     <string name="tint_nav">Semi Nav Bar</string>
     <string name="tint_nav_desc">Bara de navigare va fi aceeaşi culoare ca și antetul</string>
     <string name="web_text_scaling">Scalarea textului web</string>
diff --git a/app/src/main/res/values-ru-rRU/strings_pref_appearance.xml b/app/src/main/res/values-ru-rRU/strings_pref_appearance.xml
index 0c6288f6..3e0a7a34 100644
--- a/app/src/main/res/values-ru-rRU/strings_pref_appearance.xml
+++ b/app/src/main/res/values-ru-rRU/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Задать внешний вид главного окна</string>
     <string name="main_tabs">Внешний вид главного окна</string>
     <string name="main_tabs_desc">Настройте вкладки которые вы увидите в вашей основной странице</string>
-    <string name="rounded_icons">Скруглённые иконки</string>
-    <string name="rounded_icons_desc">Фотографии профиля и значки групп будут округляться</string>
     <string name="tint_nav">Оттенок верхней панели</string>
     <string name="tint_nav_desc">Панель навигации будет токогоже цвет как и заголовок</string>
     <string name="web_text_scaling">Масштабирование текста</string>
diff --git a/app/src/main/res/values-ru-rRU/strings_pref_notifications.xml b/app/src/main/res/values-ru-rRU/strings_pref_notifications.xml
index 28462331..add3cb9f 100644
--- a/app/src/main/res/values-ru-rRU/strings_pref_notifications.xml
+++ b/app/src/main/res/values-ru-rRU/strings_pref_notifications.xml
@@ -17,4 +17,15 @@
     <string name="notification_messages_all_accounts">Уведомлять со всех аккаунтов</string>
     <string name="notification_messages_all_accounts_desc">Получите общие уведомления для всех аккаунтов.</string>
     <string name="notification_fetch_now">Усилиные уведомления</string>
+    <string name="notification_fetch_now_desc">Запустить сборщик уведомлений один раз.</string>
+    <string name="notification_fetch_success">Извлечение уведомлений…</string>
+    <string name="notification_fetch_fail">Не удалось получить уведомления</string>
+    <string name="notification_sound">Звук уведомления</string>
+    <string name="notification_channel">Настроить каналы уведомлений</string>
+    <string name="notification_channel_desc">Изменить звук, вибрацию, приоритет и т. д</string>
+    <string name="notification_ringtone">Мелодия уведомления</string>
+    <string name="message_ringtone">Рингтон сообщения</string>
+    <string name="select_ringtone">Выбрать рингтон</string>
+    <string name="notification_vibrate">Уведомление вибрацией</string>
+    <string name="notification_lights">Уведомление светом</string>
 </resources>
diff --git a/app/src/main/res/values-sr-rSP/strings_pref_appearance.xml b/app/src/main/res/values-sr-rSP/strings_pref_appearance.xml
index db02b89e..6dfcdfb8 100644
--- a/app/src/main/res/values-sr-rSP/strings_pref_appearance.xml
+++ b/app/src/main/res/values-sr-rSP/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Изабери делатност распореда</string>
     <string name="main_tabs">Основна делатност распореда</string>
     <string name="main_tabs_desc">Изаберите које картице желите да видите у главном делу активности</string>
-    <string name="rounded_icons">Заобљене иконице</string>
-    <string name="rounded_icons_desc">Профилне слике и иконице групне преписке биће заобљене</string>
     <string name="tint_nav">Тон боје Нав Бара</string>
     <string name="tint_nav_desc">Трака за навигацију ће бити исте боје као и заглавље</string>
     <string name="web_text_scaling">Подешавање скале текста Веба</string>
diff --git a/app/src/main/res/values-sv-rSE/strings_pref_appearance.xml b/app/src/main/res/values-sv-rSE/strings_pref_appearance.xml
index 6224c7e6..a1115dfe 100644
--- a/app/src/main/res/values-sv-rSE/strings_pref_appearance.xml
+++ b/app/src/main/res/values-sv-rSE/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Välj Aktivitetsupplägg</string>
     <string name="main_tabs">Aktivitetsflikar</string>
     <string name="main_tabs_desc">Anpassa vilka flikar som du ser i din aktivitetsrad</string>
-    <string name="rounded_icons">Rundade ikoner</string>
-    <string name="rounded_icons_desc">Profilbilder och gruppkonversationsikoner avrundas</string>
     <string name="tint_nav">Färglägg navigationsraden</string>
     <string name="tint_nav_desc">Navigeringsfältet kommer att vara samma färg som header</string>
     <string name="web_text_scaling">Skalning av web-text</string>
diff --git a/app/src/main/res/values-th-rTH/strings_pref_appearance.xml b/app/src/main/res/values-th-rTH/strings_pref_appearance.xml
index e3b5f548..63e10453 100644
--- a/app/src/main/res/values-th-rTH/strings_pref_appearance.xml
+++ b/app/src/main/res/values-th-rTH/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">ตั้งเลเอ้าท์หน้าหลัก</string>
     <string name="main_tabs">แท็บหน้าหลัก</string>
     <string name="main_tabs_desc">ปรับแต่งแท็บที่คุณจะเห็นในหน้าหลักของคุณ</string>
-    <string name="rounded_icons">ไอคอนกลม</string>
-    <string name="rounded_icons_desc">รูปโปรไฟล์และไอคอนของกลุ่มสนทนาจะเป็นวงกลม</string>
     <string name="tint_nav">แถบนำทางสีอ่อน</string>
     <string name="tint_nav_desc">แถบนำทางจะเป็นสีเดียวกับส่วนหัว</string>
     <string name="web_text_scaling">ขนาดข้อความของเว็บ</string>
diff --git a/app/src/main/res/values-tl-rPH/strings_pref_appearance.xml b/app/src/main/res/values-tl-rPH/strings_pref_appearance.xml
index 71784914..3e3c0d7b 100644
--- a/app/src/main/res/values-tl-rPH/strings_pref_appearance.xml
+++ b/app/src/main/res/values-tl-rPH/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Itakda ang Plano ng Pangunahing Aktibidad</string>
     <string name="main_tabs">Ang mga Tab ng Pangunahing Aktibidad</string>
     <string name="main_tabs_desc">Alin sa mga tab ang ipapasadya na makikita mo sa iyong pangunahing aktibidad</string>
-    <string name="rounded_icons">Pabilog na mga Imahe</string>
-    <string name="rounded_icons_desc">Ang mga litrato na propayl at mga imahe ng pag-uusap ng grupo ay gagawing pabilog</string>
     <string name="tint_nav">Kinukulayan ang Nav Bar</string>
     <string name="tint_nav_desc">Ang Nabigasyong bar ay gagawing kaparehas ng kulay ng header</string>
     <string name="web_text_scaling">Ang Iskala ng Teksto ng Web</string>
diff --git a/app/src/main/res/values-tr-rTR/strings_pref_appearance.xml b/app/src/main/res/values-tr-rTR/strings_pref_appearance.xml
index affc346d..4c3a7861 100644
--- a/app/src/main/res/values-tr-rTR/strings_pref_appearance.xml
+++ b/app/src/main/res/values-tr-rTR/strings_pref_appearance.xml
@@ -13,9 +13,6 @@
     <string name="main_activity_layout_desc">Ana Etkinlik Yerleşimini Ayarla</string>
     <string name="main_tabs">Ana Etkinlik Sekmeleri</string>
     <string name="main_tabs_desc">Ana etkinliğinizde hangi sekmeleri göreceğinizi özelleştirin</string>
-    <string name="rounded_icons">Yuvarlak Simgeler</string>
-    <string name="rounded_icons_desc">Profil fotoğrafları ve grup konuşması simgeleri yuvarlaklaştırılacak
- </string>
     <string name="tint_nav">Renk tonu ayar göstergesi</string>
     <string name="tint_nav_desc">Gezinme çubuğu üstbilgi ile aynı renkte olacak</string>
     <string name="web_text_scaling">Web metin ölçekleme</string>
diff --git a/app/src/main/res/values-uk-rUA/strings_pref_appearance.xml b/app/src/main/res/values-uk-rUA/strings_pref_appearance.xml
index 51ddd847..5297d72b 100644
--- a/app/src/main/res/values-uk-rUA/strings_pref_appearance.xml
+++ b/app/src/main/res/values-uk-rUA/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Встановити основну схему діяльності</string>
     <string name="main_tabs">Вкладки основної діяльності</string>
     <string name="main_tabs_desc">Налаштуйте, які вкладки ви побачите у своїй основній діяльності</string>
-    <string name="rounded_icons">Закруглені іконки</string>
-    <string name="rounded_icons_desc">Фотографії профілю та значки групової бесіди будуть округлені</string>
     <string name="tint_nav">Відтінок верхньої панелі</string>
     <string name="tint_nav_desc">На навігаційній панелі буде мати той самий колір, що й заголовок</string>
     <string name="web_text_scaling">Масштабування веб-тексту</string>
diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml
index c020c12a..f65193bc 100644
--- a/app/src/main/res/values-vi-rVN/strings.xml
+++ b/app/src/main/res/values-vi-rVN/strings.xml
@@ -17,6 +17,7 @@
     <string name="birthdays">Sinh nhật</string>
     <string name="chat">Trò chuyện</string>
     <string name="photos">Ảnh</string>
+    <string name="marketplace">Chợ</string>
     <string name="notes">Ghi chú</string>
     <string name="on_this_day">Vào ngày này</string>
     <string name="loading_account">Đang chuẩn bị…</string>
@@ -44,4 +45,5 @@
     <string name="preview">Xem trước</string>
     <string name="options">Tuỳ chọn</string>
     <string name="tab_customizer_instructions">Bấm giữ và kéo để sắp xếp biểu tượng trên cùng.</string>
+    <string name="no_new_notifications">Không có thông báo mới</string>
 </resources>
diff --git a/app/src/main/res/values-vi-rVN/strings_errors.xml b/app/src/main/res/values-vi-rVN/strings_errors.xml
index 80fc11dd..1cfd10ba 100644
--- a/app/src/main/res/values-vi-rVN/strings_errors.xml
+++ b/app/src/main/res/values-vi-rVN/strings_errors.xml
@@ -9,4 +9,7 @@
     <string name="no_download_manager_desc">Trình quản lý tải xuống đang tắt. Bạn có muốn bật để cho phép tải xuống?</string>
     <string name="error_generic">Đã xảy ra lỗi.</string>
     <string name="video_load_failed">Không thể tải video</string>
+    <string name="error_notification">Lỗi xảy ra khi lấy thông báo</string>
+    <string name="error_sdk">Phiên bản SDK (%d) trên thiết bị của bạn không tương thích. Frost chỉ hỗ trợ Lollipop (SDK 21) trở lên</string>
+    <string name="error_webview">Thiết bị của bạn dường như không có webview. Vui lòng cài hoặc kích hoạt.</string>
 </resources>
diff --git a/app/src/main/res/values-vi-rVN/strings_pref_appearance.xml b/app/src/main/res/values-vi-rVN/strings_pref_appearance.xml
index 67928364..297fc63b 100644
--- a/app/src/main/res/values-vi-rVN/strings_pref_appearance.xml
+++ b/app/src/main/res/values-vi-rVN/strings_pref_appearance.xml
@@ -13,10 +13,10 @@
     <string name="main_activity_layout_desc">Đặt giao diện màn hình chính</string>
     <string name="main_tabs">Giao diện màn hình chính</string>
     <string name="main_tabs_desc">Tuỳ chỉnh thẻ xuất hiện trên màn hình chính</string>
-    <string name="rounded_icons">Làm tròn biểu tượng</string>
-    <string name="rounded_icons_desc">Ảnh đại diện và biểu tượng hội thoại nhóm sẽ được làm tròn</string>
     <string name="tint_nav">Đổi màu thanh điều hướng</string>
     <string name="tint_nav_desc">Thanh điều hướng sẽ có màu như thanh tiêu đề</string>
     <string name="web_text_scaling">Cỡ chữ web</string>
     <string name="web_text_scaling_desc">Ví dụ cỡ chữ: Bấm giữ số phần trăm để đặt lại.</string>
+    <string name="enforce_black_media_bg">Luôn dùng nền đen cho ảnh và video</string>
+    <string name="enforce_black_media_bg_desc">Làm đen nền ảnh và video; mặc định là màu nền trên</string>
 </resources>
diff --git a/app/src/main/res/values-vi-rVN/strings_pref_behaviour.xml b/app/src/main/res/values-vi-rVN/strings_pref_behaviour.xml
index c9017e9f..3c14e750 100644
--- a/app/src/main/res/values-vi-rVN/strings_pref_behaviour.xml
+++ b/app/src/main/res/values-vi-rVN/strings_pref_behaviour.xml
@@ -20,4 +20,5 @@
     <string name="exit_confirmation">Xác nhận thoát</string>
     <string name="exit_confirmation_desc">Hiện hộp thoại xác nhận khi thoát ứng dụng</string>
     <string name="analytics">Phân tích</string>
+    <string name="analytics_desc">Cho phép gửi phân tích và báo cáo lỗi nặc danh để cải thiện ứng dụng. Các thông tin cá nhân sẽ không bị lộ.</string>
 </resources>
diff --git a/app/src/main/res/values-vi-rVN/strings_pref_debug.xml b/app/src/main/res/values-vi-rVN/strings_pref_debug.xml
index 634f4d4e..e3fc048d 100644
--- a/app/src/main/res/values-vi-rVN/strings_pref_debug.xml
+++ b/app/src/main/res/values-vi-rVN/strings_pref_debug.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <resources>
     <string name="debug_toast_enabled">Soát lỗi đang bật. Hãy quay về cài đặt.</string>
+    <string name="debug_toast_already_enabled">Đã bật soát lỗi. Hãy quay lại phần cài đặt.</string>
     <string name="debug_disclaimer_info">Dù hầu hết các thông tin cá nhân đều tự động bị xoá khỏi báo cáo, một số thông tin nhạy cảm có thể vẫn xuất hiện. \nHãy xem lại báo cáo lỗi trước khi gửi đi. \n\nBấm một trong các tuỳ chọn dưới đây để soạn email chứa dữ liệu trang web.
     </string>
     <string name="debug_incomplete">Báo cáo không đầy đủ</string>
diff --git a/app/src/main/res/values-vi-rVN/strings_pref_experimental.xml b/app/src/main/res/values-vi-rVN/strings_pref_experimental.xml
index 33d74015..789802c4 100644
--- a/app/src/main/res/values-vi-rVN/strings_pref_experimental.xml
+++ b/app/src/main/res/values-vi-rVN/strings_pref_experimental.xml
@@ -8,4 +8,5 @@
     <string name="verbose_logging">Nhật ký chi tiết</string>
     <string name="verbose_logging_desc">Bật nhật ký chi tiết để giúp báo cáo lỗi. Các ghi chép sẽ chỉ được gửi khi phát sinh lỗi, nên hãy lặc lại lỗi để báo cho tác giả. Tính năng này sẽ tự động tắt khi khởi động lại ứng dụng.</string>
     <string name="restart_frost">Khởi động lại Frost</string>
+    <string name="restart_frost_desc">Khởi động ứng dụng lại từ đầu.</string>
 </resources>
diff --git a/app/src/main/res/values-vi-rVN/strings_pref_notifications.xml b/app/src/main/res/values-vi-rVN/strings_pref_notifications.xml
index 11a7f701..7346ce90 100644
--- a/app/src/main/res/values-vi-rVN/strings_pref_notifications.xml
+++ b/app/src/main/res/values-vi-rVN/strings_pref_notifications.xml
@@ -21,6 +21,8 @@
     <string name="notification_fetch_success">Đang lấy thông báo…</string>
     <string name="notification_fetch_fail">Không thể lấy thông báo</string>
     <string name="notification_sound">Âm báo</string>
+    <string name="notification_channel">Tuỳ chỉnh kênh thông báo</string>
+    <string name="notification_channel_desc">Thay đổi âm báo, độ rung, ưu tiên, vv</string>
     <string name="notification_ringtone">Chuông báo</string>
     <string name="message_ringtone">Nhạc chuông tin nhắn</string>
     <string name="select_ringtone">Chọn nhạc chuông</string>
diff --git a/app/src/main/res/values-zh-rCN/strings_pref_appearance.xml b/app/src/main/res/values-zh-rCN/strings_pref_appearance.xml
index 496cc28c..c4b6037f 100644
--- a/app/src/main/res/values-zh-rCN/strings_pref_appearance.xml
+++ b/app/src/main/res/values-zh-rCN/strings_pref_appearance.xml
@@ -10,8 +10,6 @@
     <string name="icon_color">图标颜色</string>
     <string name="global_customization">全局定制</string>
     <string name="main_activity_layout">主要活动布局</string>
-    <string name="rounded_icons">圆形图标</string>
-    <string name="rounded_icons_desc">圆形图标说明</string>
     <string name="tint_nav">淡色导航栏</string>
     <string name="tint_nav_desc">导航栏将会作为标题相同的颜色</string>
     <string name="web_text_scaling">Web 文本缩放</string>
diff --git a/app/src/main/res/values-zh-rTW/strings_pref_appearance.xml b/app/src/main/res/values-zh-rTW/strings_pref_appearance.xml
index 39d18bd5..12103896 100644
--- a/app/src/main/res/values-zh-rTW/strings_pref_appearance.xml
+++ b/app/src/main/res/values-zh-rTW/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">設定主要活動版型</string>
     <string name="main_tabs">主要活動標籤</string>
     <string name="main_tabs_desc">自訂您想在主要活動中看到哪些標籤</string>
-    <string name="rounded_icons">圓型圖示</string>
-    <string name="rounded_icons_desc">個人檔案照以及群組會話的圖示將被截成圓形</string>
     <string name="tint_nav">同調導航欄</string>
     <string name="tint_nav_desc">導航欄將與標題同色</string>
     <string name="web_text_scaling">Web 文字縮放</string>
diff --git a/app/src/main/res/values/strings_errors.xml b/app/src/main/res/values/strings_errors.xml
index 17ec2355..0cec420c 100644
--- a/app/src/main/res/values/strings_errors.xml
+++ b/app/src/main/res/values/strings_errors.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="null_url_overlay">Empty url given to overlay; exiting</string>
-    <string name="bad_image_overlay">The url could not be loaded properly. Would you like to send it for debugging?</string>
-    <string name="invalid_share_url">Invalid Share Url</string>
-    <string name="invalid_share_url_desc">You have shared a block of text that is not a url. The text has been copied to your clipboard, so you may share it manually  yourself.</string>
+    <string name="null_url_overlay">Empty URL given to overlay; exiting</string>
+    <string name="bad_image_overlay">The URL could not be loaded properly. Would you like to send it for debugging?</string>
+    <string name="invalid_share_url">Invalid Share URL</string>
+    <string name="invalid_share_url_desc">You have shared a block of text that is not a URL. The text has been copied to your clipboard, so you may share it manually  yourself.</string>
     <string name="no_download_manager">No Download Manager</string>
     <string name="no_download_manager_desc">The download manager is not enabled. Would you like to enable it to allow downloads?</string>
     <string name="error_generic">An error occurred.</string>
diff --git a/app/src/main/res/values/strings_no_translate.xml b/app/src/main/res/values/strings_no_translate.xml
index 9eb85dc2..d9aa6cee 100644
--- a/app/src/main/res/values/strings_no_translate.xml
+++ b/app/src/main/res/values/strings_no_translate.xml
@@ -6,6 +6,7 @@
     <string name="translation_url" translatable="false">https://crwd.in/frost-for-facebook</string>
     <string name="github_url" translatable="false">https://github.com/AllanWang/Frost-for-Facebook</string>
     <string name="github_downloads_url" translatable="false">https://github.com/AllanWang/Frost-for-Facebook/releases</string>
+    <string name="fdroid_url" translatable="false">https://f-droid.org/en/packages/com.pitchedapps.frost</string>
     <string name="reddit_url" translatable="false">https://www.reddit.com/r/FrostForFacebook</string>
     <string name="slack_url" translatable="false">https://frost-slack.allanwang.ca</string>
     <string name="xda_url" translatable="false">https://forum.xda-developers.com/android/apps-games/app-frost-facebook-t3685896</string>
diff --git a/app/src/main/res/values/strings_pref_appearance.xml b/app/src/main/res/values/strings_pref_appearance.xml
index 4f74bae3..a77d70a3 100644
--- a/app/src/main/res/values/strings_pref_appearance.xml
+++ b/app/src/main/res/values/strings_pref_appearance.xml
@@ -18,9 +18,6 @@
     <string name="main_tabs">Main Activity Tabs</string>
     <string name="main_tabs_desc">Customize which tabs you\'ll see in your main activity</string>
 
-    <string name="rounded_icons">Rounded Icons</string>
-    <string name="rounded_icons_desc">Profile photos and group conversation icons will be rounded</string>
-
     <string name="tint_nav">Tint Nav Bar</string>
     <string name="tint_nav_desc">Navigation bar will be the same color as the header</string>
     <string name="web_text_scaling">Web Text Scaling</string>
diff --git a/app/src/main/res/values/strings_pref_behaviour.xml b/app/src/main/res/values/strings_pref_behaviour.xml
index 62e94112..77c35c1c 100644
--- a/app/src/main/res/values/strings_pref_behaviour.xml
+++ b/app/src/main/res/values/strings_pref_behaviour.xml
@@ -17,6 +17,8 @@
     <string name="force_message_bottom_desc">When loading a message thread, trigger a scroll to the bottom of the page rather than loading the page as is.</string>
     <string name="enable_pip">Enable PIP</string>
     <string name="enable_pip_desc">Enable picture in picture videos</string>
+    <string name="autoplay_settings">Autoplay Settings</string>
+    <string name="autoplay_settings_desc">Open Facebook\'s auto play settings. Note that it must be disabled for PIP to work.</string>
     <string name="exit_confirmation">Exit Confirmation</string>
     <string name="exit_confirmation_desc">Show confirmation dialog before exiting the app</string>
     <string name="analytics">Analytics</string>
diff --git a/app/src/main/res/values/strings_web_context.xml b/app/src/main/res/values/strings_web_context.xml
index 756a681b..2a8ca71c 100644
--- a/app/src/main/res/values/strings_web_context.xml
+++ b/app/src/main/res/values/strings_web_context.xml
@@ -5,7 +5,7 @@
     <string name="debug_link">Debug Link</string>
     <string name="local_service_name" translatable="false">Local Frost Service</string>
     <string name="debug_link_subject" translatable="false">Frost for Facebook: Link Debug</string>
-    <string name="debug_link_content" translatable="false">Write here. Note that your link may contain private information, but I won\'t be able to see it as the post isn\'t public. The url will still help with debugging though.</string>
+    <string name="debug_link_content" translatable="false">Write here. Note that your link may contain private information, but I won\'t be able to see it as the post isn\'t public. The URL will still help with debugging though.</string>
     <string name="debug_link_desc">If a link isn\'t loading properly, you can email me so I can help debug it. Clicking okay will open an email request</string>
     <string name="open_link">Open Link</string>
     <string name="copy_link">Copy Link</string>
diff --git a/app/src/main/res/xml/frost_changelog.xml b/app/src/main/res/xml/frost_changelog.xml
index 51a872ec..1895e46f 100644
--- a/app/src/main/res/xml/frost_changelog.xml
+++ b/app/src/main/res/xml/frost_changelog.xml
@@ -6,12 +6,20 @@
     <item text="" />
     -->
 
+    <version title="v2.2.4" />
+    <item text="Show top bar to allow sharing posts" />
+    <item text="Fix unmuting videos when autoplay is enabled" />
+    <item text="Add shortcut to toggle autoplay in settings > behaviour" />
+    <item text="Update theme" />
+    <item text="" />
+
     <version title="v2.2.3" />
     <item text="Add ability to hide stories" />
     <item text="Remove fbclid from urls" />
-    <item text="" />
-    <item text="" />
-    <item text="" />
+    <item text="Apply notification keyword filter to title as well" />
+    <item text="Remove round icon settings as they are the default in Facebook" />
+    <item text="Update theme" />
+    <item text="Update translations" />
 
     <version title="v2.2.2" />
     <item text="New marketplace shortcut" />
diff --git a/app/src/test/kotlin/com/pitchedapps/frost/facebook/FbUrlTest.kt b/app/src/test/kotlin/com/pitchedapps/frost/facebook/FbUrlTest.kt
index e2a6f4ae..ca842ed9 100644
--- a/app/src/test/kotlin/com/pitchedapps/frost/facebook/FbUrlTest.kt
+++ b/app/src/test/kotlin/com/pitchedapps/frost/facebook/FbUrlTest.kt
@@ -84,6 +84,13 @@ class FbUrlTest {
     }
 
     @Test
+    fun fbclidNonFacebook() {
+        val url = "https://www.google.ca?foo&fbclid=abc&bar=bbb"
+        val formattedUrl = "https://www.google.ca?foo&bar=bbb"
+        assertFbFormat(formattedUrl, url)
+    }
+
+    @Test
     fun doubleDash() {
         assertFbFormat("${FB_URL_BASE}relative", "$FB_URL_BASE/relative")
     }
diff --git a/app/src/test/kotlin/com/pitchedapps/frost/utils/BuildUtilsTest.kt b/app/src/test/kotlin/com/pitchedapps/frost/utils/BuildUtilsTest.kt
index b3d44d69..e6b0beab 100644
--- a/app/src/test/kotlin/com/pitchedapps/frost/utils/BuildUtilsTest.kt
+++ b/app/src/test/kotlin/com/pitchedapps/frost/utils/BuildUtilsTest.kt
@@ -27,8 +27,8 @@ class BuildUtilsTest {
     @Test
     fun matchingVersions() {
         assertNull(BuildUtils.match("unknown"))
-        assertEquals(BuildUtils.Data("1.0.0", ""), BuildUtils.match("1.0.0"))
-        assertEquals(BuildUtils.Data("2.0.1", "26-af40533-debug"), BuildUtils.match("2.0.1-26-af40533-debug"))
+        assertEquals(BuildUtils.Data("v1.0.0", ""), BuildUtils.match("1.0.0"))
+        assertEquals(BuildUtils.Data("v2.0.1", "26-af40533-debug"), BuildUtils.match("2.0.1-26-af40533-debug"))
     }
 
     @Test
diff --git a/app/src/web/assets/css/components/round_icons.css b/app/src/web/assets/css/components/round_icons.css
deleted file mode 100644
index c765d2ab..00000000
--- a/app/src/web/assets/css/components/round_icons.css
+++ /dev/null
@@ -1,4 +0,0 @@
-#threadlist_rows, [role*=presentation] img._1e_c,
-i.img.profpic:not(._1_0m), ._42b6._42b6._42b6, ._5i9c.img, img._2cu2, i.img.l, [id*=threadlist] i.img:not(._1_0m) {
-  border-radius: 50% !important;
-}
diff --git a/app/src/web/assets/css/components/round_icons.scss b/app/src/web/assets/css/components/round_icons.scss
deleted file mode 100644
index c00fe1bf..00000000
--- a/app/src/web/assets/css/components/round_icons.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-#threadlist_rows, [role*=presentation] img._1e_c,
-i.img.profpic:not(._1_0m), ._42b6._42b6._42b6, ._5i9c.img, img._2cu2, i.img.l, [id*=threadlist] i.img:not(._1_0m) {
-    border-radius: 50% !important;
-}
diff --git a/app/src/web/assets/css/core/_core_bg.scss b/app/src/web/assets/css/core/_core_bg.scss
index 84cf6b00..494ee0c1 100644
--- a/app/src/web/assets/css/core/_core_bg.scss
+++ b/app/src/web/assets/css/core/_core_bg.scss
@@ -2,9 +2,9 @@
   background: $background !important;
 }
 
-body, :root, #root, #header, #MComposer, [style*="background-color"], ._1upc, input, ._2f9r, ._59e9, ._5pz4, ._5lp4,
+body, :root, #root, #header, #MComposer, ._1upc, input, ._2f9r, ._59e9, ._5pz4, ._5lp4,
 ._5lp5, .container, .subpage, ._5n_f, #static_templates, ._22_8, ._1t4h, ._uoq, ._3qdh, ._8ca, ._3h8i,
-._6-l ._2us7, ._6-l ._6-p, ._333v, div.sharerSelector, ._529j, ._305j, ._1pph, ._3t_l, ._4pvz,
+._6-l ._2us7, ._6-l ._6-p:not([style*="background-image:"]), ._333v, div.sharerSelector, ._529j, ._305j, ._1pph, ._3t_l, ._4pvz,
 ._1g05, .acy, ._51-g, ._533c, ._ib-, .sharerAttachmentEmpty, .sharerBottomWrapper, ._24e1, ._-j7,
 ._3bg5 ._56do, ._5hfh, ._52e-, .mQuestionsPollResultsBar, ._5hoc, ._5oxw, ._32_4, ._1hiz,
 ._38do, .bo, .cq, ._234-, ._a-5, ._2zh4, ._15ks, ._3oyc, ._36dc, ._3iyw ._3iyx, ._6bes, ._55wo, ._4-dy,
@@ -17,7 +17,7 @@ body, :root, #root, #header, #MComposer, [style*="background-color"], ._1upc, in
 ._5c9u, div._5y57::before, ._59f6._55so::before, .structuredPublisher, ._94v, ._vqv, ._5lp5,
 ._55wm, ._2om3, ._2ol-, ._1f9d, ._vee, ._31a-, ._3r8b, ._3r9d, ._5vq5, ._3tl8, ._65wz, ._4edl,
 .acw, ._4_xl, ._1p70, ._1p70, ._1ih_, ._51v6, ._u2c, ._484w, ._3ils, ._rm7, ._32qk, ._d01, ._1glm,
-._ue6, ._hdn._hdn,
+._ue6, ._hdn._hdn, ._6vzw, ._77xj, ._38nq, ._9_7, ._51li,
 ._2y60, ._5fu3, ._2foa, ._2y5_, ._38o9, ._1kb, .mAppCenterFatLabel, ._3bmj, ._5zmb, ._2x2s, ._3kac, ._3kad,
 ._3f50, .mentions-placeholder, .mentions, .mentions-measurer, .acg, ._59tu,
 ._4l9b, ._4gj3, .groupChromeView, ._i3g, ._3jcf, .error, ._1dbp, ._5zma, ._6beq, ._vi6,
@@ -27,7 +27,7 @@ body, :root, #root, #header, #MComposer, [style*="background-color"], ._1upc, in
 }
 
 //card related
-._31nf, ._2v9s, ._d4i, article._55wo, ._10c_, ._2jl2, ._55wo, ._6150, ._50mi, ._4-dw, ._4_2z, ._5m_s {
+._31nf, ._2v9s, ._d4i, article._55wo, ._10c_, ._2jl2, ._6150, ._50mi, ._4-dw, ._4_2z, ._5m_s, ._13fn {
   background: $card !important;
 }
 
@@ -58,11 +58,11 @@ body, :root, #root, #header, #MComposer, [style*="background-color"], ._1upc, in
 button:not([style*=image]):not(.privacyButtons), button::before, .touch ._56bt, ._56be::before, .btnS, .touch::before,
 ._590n, ._4g8h, ._2cpp, ._58a0.touched:after,
 .timeline .timelinePublisher, .touched, .sharerAttachment,
-.item a.primary.touched .primarywrap, ._38nq, ._537a,
+.item a.primary.touched .primarywrap, ._537a, ._7cui,
 ._5xo2, ._5u5a::before, ._4u3j, ._15ks, ._5hua, ._59tt, ._41ft, .jx-tokenizer, ._55fj,
 .excessItem, .acr, ._5-lx, ._3g9-, ._55ws, ._6dsj ._3gin, ._69aj,
 ._4e8n, ._5pxa._3uj9, ._5n_5, ._u2d, ._56bu::before, ._5h8f, ._d00, ._2066, ._2k51,
-._10sb li.selected, ._2z4j, ._ib-, ._1bhl, ._5a5j,
+._10sb li.selected, ._2z4j, ._ib-, ._1bhl, ._5a5j, ._6--d, ._77p7,
 ._2b06, ._2tsf, ._3gka, .mCount, ._27vc, ._4pv-, ._6pk5,
 ._4qax, ._4756, ._w34, ._56bv::before, ._5769, ._34iv, ._z-w, ._t21, .mToken,
 #addMembersTypeahead .mToken.mTokenWeakReference,
diff --git a/app/src/web/assets/css/core/_core_border.scss b/app/src/web/assets/css/core/_core_border.scss
index c366bc14..9f2bdec0 100644
--- a/app/src/web/assets/css/core/_core_border.scss
+++ b/app/src/web/assets/css/core/_core_border.scss
@@ -4,15 +4,15 @@
   border-left: 1px solid $divider !important;
 }
 
-._4_d1, ._5cni {
+._4_d1, ._5cni, ._3jcq {
   border-right: 1px solid $divider !important;
 }
 
 //above see more
 ._1mx0, ._1rbr, ._5yt8, ._idb, ._cld, ._1e8h, ._z-w, ._1ha, ._1n8h ._1oby, ._5f99, ._2t39,
-._2pbp, ._5rou:first-child, ._egf:first-child, ._io2, ._3qdi ._48_m::after,
+._2pbp, ._5rou:first-child, ._egf:first-child, ._io2, ._3qdi ._48_m::after, ._46dd::before,
 ._15n_, ._3-2-, ._27ve, ._2s20, ._gui, ._2s21 > *::after, ._32qk, ._d00, ._d01, ._38o9,
-._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils, ._5as0, ._5as2,
+._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils, ._5as0, ._5as2, ._5-lw,
 ._52x1, ._3wjp, ._usq, ._2cul:before, ._13e_, .jewel .flyout, ._3bg5 ._52x6, ._56d8, .al {
   border-top: 1px solid $divider !important;
 }
@@ -24,7 +24,7 @@
 .mAppCenterFatLabel, .appCenterCategorySelectorButton, ._1q6v, ._5q_r, ._5yt8, ._38do, ._38dt,
 ._ap1, ._52x1, ._59tu, ._usq, ._13e_, ._59f6._55so::before, ._4gj3, .error, ._35--, ._1wev,
 .jx-result, ._1f9d, ._vef, ._55x2 > *, .al, ._44qk, ._5rgs, ._5xuj, ._1sv1, ._idb,
-._5lp5, ._3-2-, ._3to6, ._ir5, ._4nw6, ._4nwh, ._27ve, div._51v6::before,
+._5lp5, ._3-2-, ._3to6, ._ir5, ._4nw6, ._4nwh, ._27ve, div._51v6::before, ._5hu6,
 ._3c9h::before, ._2s20, ._gui, ._5jku, ._2foa, ._2y60, ._5fu3, ._4en9, ._1kb:not(:last-child) ._1kc,
 ._5pz4, ._5lp4, ._5lp5, ._5h6z, ._5h6x, ._2om4, ._5fjw > div, ._5fjv > :first-child,
 ._5fjw > :first-child {
@@ -45,7 +45,7 @@
 ._1_y5, ._lr0, ._5hgt, ._2cpp, ._50uu, ._50uw, ._31yd, ._1e3d, ._3xz7, ._1xoz,
 ._4kcb, ._2lut, .jewel .touchable-notification.touched, .touchable-notification .touchable.touched,
 .home-notification .touchable.touched, ._6beo ._6ber,
-._73ku ._73jw,
+._73ku ._73jw, ._6--d, ._26vk._56bt,
 ._4e8n, ._uww, .mentions-placeholder, .mentions-shadow, .mentions-measurer,
 ._5whq, ._59tt, ._41ft::after, .jx-tokenizer, ._3uqf, ._4756, ._1rrd, ._5n_f {
   border: 1px solid $divider !important;
@@ -91,4 +91,4 @@
 
 ._484w.selected > ._6zf, ._5kqs::after, ._3lvo ._5xum._5xuk, ._x0b {
   border-bottom: 1px solid $text !important;
-}
-\ No newline at end of file
+}
diff --git a/app/src/web/assets/css/core/_core_text.scss b/app/src/web/assets/css/core/_core_text.scss
index bc6d687a..63622610 100644
--- a/app/src/web/assets/css/core/_core_text.scss
+++ b/app/src/web/assets/css/core/_core_text.scss
@@ -1,4 +1,4 @@
-[style*="color"], body, input, ._42rv, ._4qau, ._dwm .descArea, ._eu5,
+body, input, ._42rv, ._4qau, ._dwm .descArea, ._eu5,
 ._1tcc, ._3g9-, ._29z_, ._3xz7, ._ib-, ._3bg5 ._56dq, ._477i, ._2vxk,
 .touched *, ._1_yj, ._1_yl, ._4pj9, ._2bdc, ._3qdh ._3qdn ._3qdk, ._3qdk ._48_q,
 ._z-z, ._z-v, ._1e8d, ._36nl, ._36nm, ._2_11, ._2_rf, ._2ip_, ._403p, .cq, ._usr,
@@ -10,15 +10,16 @@
 ._18qg, ._1_ac, ._529p, ._4dwt ._1vh3, ._4a5f, ._23_t, ._2rzc, ._23_s, ._2rzd,
 ._5aga, ._5ag9, ._537a, .acy, ._5ro_, ._6-l ._2us7, ._4mp, ._2b08, ._36e0, ._4-dy,
 ._14v5 ._14v8, ._1440, ._1442, ._1448, ._4ks_, .mCount, ._27vc, ._24e1, ._2rbw, ._3iyw ._3mzw,
-textarea, ._24pi, ._4en9, ._1kb, ._5p7j, ._2klz, ._5780, ._5781, ._5782,
-._3u9u, ._3u9_, ._3u9s, ._1hcx, ._2066, ._1_-1, ._cv_, ._1nbx, ._2cuh,
-._4ms9, ._4ms5, ._4ms6, ._31b4, ._31b5, ._5q_r, ._idb, ._38d-, ._3n8y, ._38dt, ._3oyg,
-._27vp, ._4nwe, ._4nw9, ._27vi, .appCenterAppInfo, .appCenterPermissions,
-._3c9l, ._3c9m, ._4jn_, ._32qt, ._3mom, ._3moo, ._-7o, ._d00, ._d01, ._559g,
-._2new, .appCenterCategorySelectorButton, ._1ksq, ._1kt6, ._6ber, ._mxb, ._3oyd,
+textarea:not([style*="color: rgb"]), ._24pi, ._4en9, ._1kb, ._5p7j, ._2klz, ._5780, ._5781, ._5782,
+._3u9u, ._3u9_, ._3u9s, ._1hcx, ._2066, ._1_-1, ._cv_, ._1nbx, ._2cuh, ._6--d, ._77p7, ._7h_g,
+._4ms9, ._4ms5, ._4ms6, ._31b4, ._31b5, ._5q_r, ._idb, ._38d-, ._3n8y, ._38dt, ._3oyg, ._21dc,
+._27vp, ._4nwe, ._4nw9, ._27vi, .appCenterAppInfo, .appCenterPermissions, ._6xqt, ._7cui,
+._3c9l, ._3c9m, ._4jn_, ._32qt, ._3mom, ._3moo, ._-7o, ._d00, ._d01, ._559g, ._7cdj,
+._2new, .appCenterCategorySelectorButton, ._1ksq, ._1kt6, ._6ber, ._mxb, ._3oyd, ._3gir, ._3gis,
 div.sharerSelector, .footer, ._4pv_, ._1dbp, ._3kad, ._20zc, ._2i5v, ._2i5w,
 a, ._5fpq, ._4gux, ._3bg5 ._52x1, ._3bg5 ._52x2, ._6dsj ._3gin, ._hdn._hdn,
-.mentions-input, .mentions-placeholder, .largeStatusBox .placeHolder, .fcw,
+.mentions-input:not([style*="color: rgb"]), .mentions-placeholder:not([style*="color: rgb"]),
+.largeStatusBox .placeHolder, .fcw, ._2rgt, ._67i4 ._5hu6 ._59tt,
 ._5-7t, .fcl, ._4qas, .thread-title, .title, ._46pa, ._336p, ._1rrd, ._2om4,
 ._3m1m, ._2om2, ._5n_e, .appListExplanation, ._5yt8, ._8he, ._2luw, ._5rgs,
 h1, h2, h3, h4, h5, h6 {
diff --git a/app/src/web/assets/css/core/core.css b/app/src/web/assets/css/core/core.css
index 483f4d36..d9a9dfd4 100644
--- a/app/src/web/assets/css/core/core.css
+++ b/app/src/web/assets/css/core/core.css
@@ -1,4 +1,4 @@
-[style*=color], body, input, ._42rv, ._4qau, ._dwm .descArea, ._eu5,
+body, input, ._42rv, ._4qau, ._dwm .descArea, ._eu5,
 ._1tcc, ._3g9-, ._29z_, ._3xz7, ._ib-, ._3bg5 ._56dq, ._477i, ._2vxk,
 .touched *, ._1_yj, ._1_yl, ._4pj9, ._2bdc, ._3qdh ._3qdn ._3qdk, ._3qdk ._48_q,
 ._z-z, ._z-v, ._1e8d, ._36nl, ._36nm, ._2_11, ._2_rf, ._2ip_, ._403p, .cq, ._usr,
@@ -10,15 +10,16 @@
 ._18qg, ._1_ac, ._529p, ._4dwt ._1vh3, ._4a5f, ._23_t, ._2rzc, ._23_s, ._2rzd,
 ._5aga, ._5ag9, ._537a, .acy, ._5ro_, ._6-l ._2us7, ._4mp, ._2b08, ._36e0, ._4-dy,
 ._14v5 ._14v8, ._1440, ._1442, ._1448, ._4ks_, .mCount, ._27vc, ._24e1, ._2rbw, ._3iyw ._3mzw,
-textarea, ._24pi, ._4en9, ._1kb, ._5p7j, ._2klz, ._5780, ._5781, ._5782,
-._3u9u, ._3u9_, ._3u9s, ._1hcx, ._2066, ._1_-1, ._cv_, ._1nbx, ._2cuh,
-._4ms9, ._4ms5, ._4ms6, ._31b4, ._31b5, ._5q_r, ._idb, ._38d-, ._3n8y, ._38dt, ._3oyg,
-._27vp, ._4nwe, ._4nw9, ._27vi, .appCenterAppInfo, .appCenterPermissions,
-._3c9l, ._3c9m, ._4jn_, ._32qt, ._3mom, ._3moo, ._-7o, ._d00, ._d01, ._559g,
-._2new, .appCenterCategorySelectorButton, ._1ksq, ._1kt6, ._6ber, ._mxb, ._3oyd,
+textarea:not([style*="color: rgb"]), ._24pi, ._4en9, ._1kb, ._5p7j, ._2klz, ._5780, ._5781, ._5782,
+._3u9u, ._3u9_, ._3u9s, ._1hcx, ._2066, ._1_-1, ._cv_, ._1nbx, ._2cuh, ._6--d, ._77p7, ._7h_g,
+._4ms9, ._4ms5, ._4ms6, ._31b4, ._31b5, ._5q_r, ._idb, ._38d-, ._3n8y, ._38dt, ._3oyg, ._21dc,
+._27vp, ._4nwe, ._4nw9, ._27vi, .appCenterAppInfo, .appCenterPermissions, ._6xqt, ._7cui,
+._3c9l, ._3c9m, ._4jn_, ._32qt, ._3mom, ._3moo, ._-7o, ._d00, ._d01, ._559g, ._7cdj,
+._2new, .appCenterCategorySelectorButton, ._1ksq, ._1kt6, ._6ber, ._mxb, ._3oyd, ._3gir, ._3gis,
 div.sharerSelector, .footer, ._4pv_, ._1dbp, ._3kad, ._20zc, ._2i5v, ._2i5w,
 a, ._5fpq, ._4gux, ._3bg5 ._52x1, ._3bg5 ._52x2, ._6dsj ._3gin, ._hdn._hdn,
-.mentions-input, .mentions-placeholder, .largeStatusBox .placeHolder, .fcw,
+.mentions-input:not([style*="color: rgb"]), .mentions-placeholder:not([style*="color: rgb"]),
+.largeStatusBox .placeHolder, .fcw, ._2rgt, ._67i4 ._5hu6 ._59tt,
 ._5-7t, .fcl, ._4qas, .thread-title, .title, ._46pa, ._336p, ._1rrd, ._2om4,
 ._3m1m, ._2om2, ._5n_e, .appListExplanation, ._5yt8, ._8he, ._2luw, ._5rgs,
 h1, h2, h3, h4, h5, h6 {
@@ -41,9 +42,9 @@ p > a, .msg span > a {
   background: #451515 !important;
 }
 
-body, :root, #root, #header, #MComposer, [style*=background-color], ._1upc, input, ._2f9r, ._59e9, ._5pz4, ._5lp4,
+body, :root, #root, #header, #MComposer, ._1upc, input, ._2f9r, ._59e9, ._5pz4, ._5lp4,
 ._5lp5, .container, .subpage, ._5n_f, #static_templates, ._22_8, ._1t4h, ._uoq, ._3qdh, ._8ca, ._3h8i,
-._6-l ._2us7, ._6-l ._6-p, ._333v, div.sharerSelector, ._529j, ._305j, ._1pph, ._3t_l, ._4pvz,
+._6-l ._2us7, ._6-l ._6-p:not([style*="background-image:"]), ._333v, div.sharerSelector, ._529j, ._305j, ._1pph, ._3t_l, ._4pvz,
 ._1g05, .acy, ._51-g, ._533c, ._ib-, .sharerAttachmentEmpty, .sharerBottomWrapper, ._24e1, ._-j7,
 ._3bg5 ._56do, ._5hfh, ._52e-, .mQuestionsPollResultsBar, ._5hoc, ._5oxw, ._32_4, ._1hiz,
 ._38do, .bo, .cq, ._234-, ._a-5, ._2zh4, ._15ks, ._3oyc, ._36dc, ._3iyw ._3iyx, ._6bes, ._55wo, ._4-dy,
@@ -56,7 +57,7 @@ body, :root, #root, #header, #MComposer, [style*=background-color], ._1upc, inpu
 ._5c9u, div._5y57::before, ._59f6._55so::before, .structuredPublisher, ._94v, ._vqv, ._5lp5,
 ._55wm, ._2om3, ._2ol-, ._1f9d, ._vee, ._31a-, ._3r8b, ._3r9d, ._5vq5, ._3tl8, ._65wz, ._4edl,
 .acw, ._4_xl, ._1p70, ._1p70, ._1ih_, ._51v6, ._u2c, ._484w, ._3ils, ._rm7, ._32qk, ._d01, ._1glm,
-._ue6, ._hdn._hdn,
+._ue6, ._hdn._hdn, ._6vzw, ._77xj, ._38nq, ._9_7, ._51li,
 ._2y60, ._5fu3, ._2foa, ._2y5_, ._38o9, ._1kb, .mAppCenterFatLabel, ._3bmj, ._5zmb, ._2x2s, ._3kac, ._3kad,
 ._3f50, .mentions-placeholder, .mentions, .mentions-measurer, .acg, ._59tu,
 ._4l9b, ._4gj3, .groupChromeView, ._i3g, ._3jcf, .error, ._1dbp, ._5zma, ._6beq, ._vi6,
@@ -65,7 +66,7 @@ body, :root, #root, #header, #MComposer, [style*=background-color], ._1upc, inpu
   background: rgba(255, 0, 255, 0.02) !important;
 }
 
-._31nf, ._2v9s, ._d4i, article._55wo, ._10c_, ._2jl2, ._55wo, ._6150, ._50mi, ._4-dw, ._4_2z, ._5m_s {
+._31nf, ._2v9s, ._d4i, article._55wo, ._10c_, ._2jl2, ._6150, ._50mi, ._4-dw, ._4_2z, ._5m_s, ._13fn {
   background: #239645 !important;
 }
 
@@ -93,11 +94,11 @@ body, :root, #root, #header, #MComposer, [style*=background-color], ._1upc, inpu
 button:not([style*=image]):not(.privacyButtons), button::before, .touch ._56bt, ._56be::before, .btnS, .touch::before,
 ._590n, ._4g8h, ._2cpp, ._58a0.touched:after,
 .timeline .timelinePublisher, .touched, .sharerAttachment,
-.item a.primary.touched .primarywrap, ._38nq, ._537a,
+.item a.primary.touched .primarywrap, ._537a, ._7cui,
 ._5xo2, ._5u5a::before, ._4u3j, ._15ks, ._5hua, ._59tt, ._41ft, .jx-tokenizer, ._55fj,
 .excessItem, .acr, ._5-lx, ._3g9-, ._55ws, ._6dsj ._3gin, ._69aj,
 ._4e8n, ._5pxa._3uj9, ._5n_5, ._u2d, ._56bu::before, ._5h8f, ._d00, ._2066, ._2k51,
-._10sb li.selected, ._2z4j, ._ib-, ._1bhl, ._5a5j,
+._10sb li.selected, ._2z4j, ._ib-, ._1bhl, ._5a5j, ._6--d, ._77p7,
 ._2b06, ._2tsf, ._3gka, .mCount, ._27vc, ._4pv-, ._6pk5,
 ._4qax, ._4756, ._w34, ._56bv::before, ._5769, ._34iv, ._z-w, ._t21, .mToken,
 #addMembersTypeahead .mToken.mTokenWeakReference,
@@ -124,14 +125,14 @@ button ._v89 ._54k8._1fl1 {
   border-left: 1px solid rgba(215, 176, 215, 0.3) !important;
 }
 
-._4_d1, ._5cni {
+._4_d1, ._5cni, ._3jcq {
   border-right: 1px solid rgba(215, 176, 215, 0.3) !important;
 }
 
 ._1mx0, ._1rbr, ._5yt8, ._idb, ._cld, ._1e8h, ._z-w, ._1ha, ._1n8h ._1oby, ._5f99, ._2t39,
-._2pbp, ._5rou:first-child, ._egf:first-child, ._io2, ._3qdi ._48_m::after,
+._2pbp, ._5rou:first-child, ._egf:first-child, ._io2, ._3qdi ._48_m::after, ._46dd::before,
 ._15n_, ._3-2-, ._27ve, ._2s20, ._gui, ._2s21 > *::after, ._32qk, ._d00, ._d01, ._38o9,
-._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils, ._5as0, ._5as2,
+._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils, ._5as0, ._5as2, ._5-lw,
 ._52x1, ._3wjp, ._usq, ._2cul:before, ._13e_, .jewel .flyout, ._3bg5 ._52x6, ._56d8, .al {
   border-top: 1px solid rgba(215, 176, 215, 0.3) !important;
 }
@@ -143,7 +144,7 @@ button ._v89 ._54k8._1fl1 {
 .mAppCenterFatLabel, .appCenterCategorySelectorButton, ._1q6v, ._5q_r, ._5yt8, ._38do, ._38dt,
 ._ap1, ._52x1, ._59tu, ._usq, ._13e_, ._59f6._55so::before, ._4gj3, .error, ._35--, ._1wev,
 .jx-result, ._1f9d, ._vef, ._55x2 > *, .al, ._44qk, ._5rgs, ._5xuj, ._1sv1, ._idb,
-._5lp5, ._3-2-, ._3to6, ._ir5, ._4nw6, ._4nwh, ._27ve, div._51v6::before,
+._5lp5, ._3-2-, ._3to6, ._ir5, ._4nw6, ._4nwh, ._27ve, div._51v6::before, ._5hu6,
 ._3c9h::before, ._2s20, ._gui, ._5jku, ._2foa, ._2y60, ._5fu3, ._4en9, ._1kb:not(:last-child) ._1kc,
 ._5pz4, ._5lp4, ._5lp5, ._5h6z, ._5h6x, ._2om4, ._5fjw > div, ._5fjv > :first-child,
 ._5fjw > :first-child {
@@ -163,7 +164,7 @@ button ._v89 ._54k8._1fl1 {
 ._1_y5, ._lr0, ._5hgt, ._2cpp, ._50uu, ._50uw, ._31yd, ._1e3d, ._3xz7, ._1xoz,
 ._4kcb, ._2lut, .jewel .touchable-notification.touched, .touchable-notification .touchable.touched,
 .home-notification .touchable.touched, ._6beo ._6ber,
-._73ku ._73jw,
+._73ku ._73jw, ._6--d, ._26vk._56bt,
 ._4e8n, ._uww, .mentions-placeholder, .mentions-shadow, .mentions-measurer,
 ._5whq, ._59tt, ._41ft::after, .jx-tokenizer, ._3uqf, ._4756, ._1rrd, ._5n_f {
   border: 1px solid rgba(215, 176, 215, 0.3) !important;
diff --git a/app/src/web/assets/css/themes/custom.css b/app/src/web/assets/css/themes/custom.css
index 56ee7efc..9d408971 100644
--- a/app/src/web/assets/css/themes/custom.css
+++ b/app/src/web/assets/css/themes/custom.css
@@ -1,4 +1,4 @@
-[style*=color], body, input, ._42rv, ._4qau, ._dwm .descArea, ._eu5,
+body, input, ._42rv, ._4qau, ._dwm .descArea, ._eu5,
 ._1tcc, ._3g9-, ._29z_, ._3xz7, ._ib-, ._3bg5 ._56dq, ._477i, ._2vxk,
 .touched *, ._1_yj, ._1_yl, ._4pj9, ._2bdc, ._3qdh ._3qdn ._3qdk, ._3qdk ._48_q,
 ._z-z, ._z-v, ._1e8d, ._36nl, ._36nm, ._2_11, ._2_rf, ._2ip_, ._403p, .cq, ._usr,
@@ -10,15 +10,16 @@
 ._18qg, ._1_ac, ._529p, ._4dwt ._1vh3, ._4a5f, ._23_t, ._2rzc, ._23_s, ._2rzd,
 ._5aga, ._5ag9, ._537a, .acy, ._5ro_, ._6-l ._2us7, ._4mp, ._2b08, ._36e0, ._4-dy,
 ._14v5 ._14v8, ._1440, ._1442, ._1448, ._4ks_, .mCount, ._27vc, ._24e1, ._2rbw, ._3iyw ._3mzw,
-textarea, ._24pi, ._4en9, ._1kb, ._5p7j, ._2klz, ._5780, ._5781, ._5782,
-._3u9u, ._3u9_, ._3u9s, ._1hcx, ._2066, ._1_-1, ._cv_, ._1nbx, ._2cuh,
-._4ms9, ._4ms5, ._4ms6, ._31b4, ._31b5, ._5q_r, ._idb, ._38d-, ._3n8y, ._38dt, ._3oyg,
-._27vp, ._4nwe, ._4nw9, ._27vi, .appCenterAppInfo, .appCenterPermissions,
-._3c9l, ._3c9m, ._4jn_, ._32qt, ._3mom, ._3moo, ._-7o, ._d00, ._d01, ._559g,
-._2new, .appCenterCategorySelectorButton, ._1ksq, ._1kt6, ._6ber, ._mxb, ._3oyd,
+textarea:not([style*="color: rgb"]), ._24pi, ._4en9, ._1kb, ._5p7j, ._2klz, ._5780, ._5781, ._5782,
+._3u9u, ._3u9_, ._3u9s, ._1hcx, ._2066, ._1_-1, ._cv_, ._1nbx, ._2cuh, ._6--d, ._77p7, ._7h_g,
+._4ms9, ._4ms5, ._4ms6, ._31b4, ._31b5, ._5q_r, ._idb, ._38d-, ._3n8y, ._38dt, ._3oyg, ._21dc,
+._27vp, ._4nwe, ._4nw9, ._27vi, .appCenterAppInfo, .appCenterPermissions, ._6xqt, ._7cui,
+._3c9l, ._3c9m, ._4jn_, ._32qt, ._3mom, ._3moo, ._-7o, ._d00, ._d01, ._559g, ._7cdj,
+._2new, .appCenterCategorySelectorButton, ._1ksq, ._1kt6, ._6ber, ._mxb, ._3oyd, ._3gir, ._3gis,
 div.sharerSelector, .footer, ._4pv_, ._1dbp, ._3kad, ._20zc, ._2i5v, ._2i5w,
 a, ._5fpq, ._4gux, ._3bg5 ._52x1, ._3bg5 ._52x2, ._6dsj ._3gin, ._hdn._hdn,
-.mentions-input, .mentions-placeholder, .largeStatusBox .placeHolder, .fcw,
+.mentions-input:not([style*="color: rgb"]), .mentions-placeholder:not([style*="color: rgb"]),
+.largeStatusBox .placeHolder, .fcw, ._2rgt, ._67i4 ._5hu6 ._59tt,
 ._5-7t, .fcl, ._4qas, .thread-title, .title, ._46pa, ._336p, ._1rrd, ._2om4,
 ._3m1m, ._2om2, ._5n_e, .appListExplanation, ._5yt8, ._8he, ._2luw, ._5rgs,
 h1, h2, h3, h4, h5, h6 {
@@ -41,9 +42,9 @@ p > a, .msg span > a {
   background: $B$ !important;
 }
 
-body, :root, #root, #header, #MComposer, [style*=background-color], ._1upc, input, ._2f9r, ._59e9, ._5pz4, ._5lp4,
+body, :root, #root, #header, #MComposer, ._1upc, input, ._2f9r, ._59e9, ._5pz4, ._5lp4,
 ._5lp5, .container, .subpage, ._5n_f, #static_templates, ._22_8, ._1t4h, ._uoq, ._3qdh, ._8ca, ._3h8i,
-._6-l ._2us7, ._6-l ._6-p, ._333v, div.sharerSelector, ._529j, ._305j, ._1pph, ._3t_l, ._4pvz,
+._6-l ._2us7, ._6-l ._6-p:not([style*="background-image:"]), ._333v, div.sharerSelector, ._529j, ._305j, ._1pph, ._3t_l, ._4pvz,
 ._1g05, .acy, ._51-g, ._533c, ._ib-, .sharerAttachmentEmpty, .sharerBottomWrapper, ._24e1, ._-j7,
 ._3bg5 ._56do, ._5hfh, ._52e-, .mQuestionsPollResultsBar, ._5hoc, ._5oxw, ._32_4, ._1hiz,
 ._38do, .bo, .cq, ._234-, ._a-5, ._2zh4, ._15ks, ._3oyc, ._36dc, ._3iyw ._3iyx, ._6bes, ._55wo, ._4-dy,
@@ -56,7 +57,7 @@ body, :root, #root, #header, #MComposer, [style*=background-color], ._1upc, inpu
 ._5c9u, div._5y57::before, ._59f6._55so::before, .structuredPublisher, ._94v, ._vqv, ._5lp5,
 ._55wm, ._2om3, ._2ol-, ._1f9d, ._vee, ._31a-, ._3r8b, ._3r9d, ._5vq5, ._3tl8, ._65wz, ._4edl,
 .acw, ._4_xl, ._1p70, ._1p70, ._1ih_, ._51v6, ._u2c, ._484w, ._3ils, ._rm7, ._32qk, ._d01, ._1glm,
-._ue6, ._hdn._hdn,
+._ue6, ._hdn._hdn, ._6vzw, ._77xj, ._38nq, ._9_7, ._51li,
 ._2y60, ._5fu3, ._2foa, ._2y5_, ._38o9, ._1kb, .mAppCenterFatLabel, ._3bmj, ._5zmb, ._2x2s, ._3kac, ._3kad,
 ._3f50, .mentions-placeholder, .mentions, .mentions-measurer, .acg, ._59tu,
 ._4l9b, ._4gj3, .groupChromeView, ._i3g, ._3jcf, .error, ._1dbp, ._5zma, ._6beq, ._vi6,
@@ -65,7 +66,7 @@ body, :root, #root, #header, #MComposer, [style*=background-color], ._1upc, inpu
   background: $BT$ !important;
 }
 
-._31nf, ._2v9s, ._d4i, article._55wo, ._10c_, ._2jl2, ._55wo, ._6150, ._50mi, ._4-dw, ._4_2z, ._5m_s {
+._31nf, ._2v9s, ._d4i, article._55wo, ._10c_, ._2jl2, ._6150, ._50mi, ._4-dw, ._4_2z, ._5m_s, ._13fn {
   background: $C$ !important;
 }
 
@@ -93,11 +94,11 @@ body, :root, #root, #header, #MComposer, [style*=background-color], ._1upc, inpu
 button:not([style*=image]):not(.privacyButtons), button::before, .touch ._56bt, ._56be::before, .btnS, .touch::before,
 ._590n, ._4g8h, ._2cpp, ._58a0.touched:after,
 .timeline .timelinePublisher, .touched, .sharerAttachment,
-.item a.primary.touched .primarywrap, ._38nq, ._537a,
+.item a.primary.touched .primarywrap, ._537a, ._7cui,
 ._5xo2, ._5u5a::before, ._4u3j, ._15ks, ._5hua, ._59tt, ._41ft, .jx-tokenizer, ._55fj,
 .excessItem, .acr, ._5-lx, ._3g9-, ._55ws, ._6dsj ._3gin, ._69aj,
 ._4e8n, ._5pxa._3uj9, ._5n_5, ._u2d, ._56bu::before, ._5h8f, ._d00, ._2066, ._2k51,
-._10sb li.selected, ._2z4j, ._ib-, ._1bhl, ._5a5j,
+._10sb li.selected, ._2z4j, ._ib-, ._1bhl, ._5a5j, ._6--d, ._77p7,
 ._2b06, ._2tsf, ._3gka, .mCount, ._27vc, ._4pv-, ._6pk5,
 ._4qax, ._4756, ._w34, ._56bv::before, ._5769, ._34iv, ._z-w, ._t21, .mToken,
 #addMembersTypeahead .mToken.mTokenWeakReference,
@@ -124,14 +125,14 @@ button ._v89 ._54k8._1fl1 {
   border-left: 1px solid $D$ !important;
 }
 
-._4_d1, ._5cni {
+._4_d1, ._5cni, ._3jcq {
   border-right: 1px solid $D$ !important;
 }
 
 ._1mx0, ._1rbr, ._5yt8, ._idb, ._cld, ._1e8h, ._z-w, ._1ha, ._1n8h ._1oby, ._5f99, ._2t39,
-._2pbp, ._5rou:first-child, ._egf:first-child, ._io2, ._3qdi ._48_m::after,
+._2pbp, ._5rou:first-child, ._egf:first-child, ._io2, ._3qdi ._48_m::after, ._46dd::before,
 ._15n_, ._3-2-, ._27ve, ._2s20, ._gui, ._2s21 > *::after, ._32qk, ._d00, ._d01, ._38o9,
-._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils, ._5as0, ._5as2,
+._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils, ._5as0, ._5as2, ._5-lw,
 ._52x1, ._3wjp, ._usq, ._2cul:before, ._13e_, .jewel .flyout, ._3bg5 ._52x6, ._56d8, .al {
   border-top: 1px solid $D$ !important;
 }
@@ -143,7 +144,7 @@ button ._v89 ._54k8._1fl1 {
 .mAppCenterFatLabel, .appCenterCategorySelectorButton, ._1q6v, ._5q_r, ._5yt8, ._38do, ._38dt,
 ._ap1, ._52x1, ._59tu, ._usq, ._13e_, ._59f6._55so::before, ._4gj3, .error, ._35--, ._1wev,
 .jx-result, ._1f9d, ._vef, ._55x2 > *, .al, ._44qk, ._5rgs, ._5xuj, ._1sv1, ._idb,
-._5lp5, ._3-2-, ._3to6, ._ir5, ._4nw6, ._4nwh, ._27ve, div._51v6::before,
+._5lp5, ._3-2-, ._3to6, ._ir5, ._4nw6, ._4nwh, ._27ve, div._51v6::before, ._5hu6,
 ._3c9h::before, ._2s20, ._gui, ._5jku, ._2foa, ._2y60, ._5fu3, ._4en9, ._1kb:not(:last-child) ._1kc,
 ._5pz4, ._5lp4, ._5lp5, ._5h6z, ._5h6x, ._2om4, ._5fjw > div, ._5fjv > :first-child,
 ._5fjw > :first-child {
@@ -163,7 +164,7 @@ button ._v89 ._54k8._1fl1 {
 ._1_y5, ._lr0, ._5hgt, ._2cpp, ._50uu, ._50uw, ._31yd, ._1e3d, ._3xz7, ._1xoz,
 ._4kcb, ._2lut, .jewel .touchable-notification.touched, .touchable-notification .touchable.touched,
 .home-notification .touchable.touched, ._6beo ._6ber,
-._73ku ._73jw,
+._73ku ._73jw, ._6--d, ._26vk._56bt,
 ._4e8n, ._uww, .mentions-placeholder, .mentions-shadow, .mentions-measurer,
 ._5whq, ._59tt, ._41ft::after, .jx-tokenizer, ._3uqf, ._4756, ._1rrd, ._5n_f {
   border: 1px solid $D$ !important;
diff --git a/app/src/web/assets/css/themes/material_amoled.css b/app/src/web/assets/css/themes/material_amoled.css
index a214a17f..6cf12e2b 100644
--- a/app/src/web/assets/css/themes/material_amoled.css
+++ b/app/src/web/assets/css/themes/material_amoled.css
@@ -1,4 +1,4 @@
-[style*=color], body, input, ._42rv, ._4qau, ._dwm .descArea, ._eu5,
+body, input, ._42rv, ._4qau, ._dwm .descArea, ._eu5,
 ._1tcc, ._3g9-, ._29z_, ._3xz7, ._ib-, ._3bg5 ._56dq, ._477i, ._2vxk,
 .touched *, ._1_yj, ._1_yl, ._4pj9, ._2bdc, ._3qdh ._3qdn ._3qdk, ._3qdk ._48_q,
 ._z-z, ._z-v, ._1e8d, ._36nl, ._36nm, ._2_11, ._2_rf, ._2ip_, ._403p, .cq, ._usr,
@@ -10,15 +10,16 @@
 ._18qg, ._1_ac, ._529p, ._4dwt ._1vh3, ._4a5f, ._23_t, ._2rzc, ._23_s, ._2rzd,
 ._5aga, ._5ag9, ._537a, .acy, ._5ro_, ._6-l ._2us7, ._4mp, ._2b08, ._36e0, ._4-dy,
 ._14v5 ._14v8, ._1440, ._1442, ._1448, ._4ks_, .mCount, ._27vc, ._24e1, ._2rbw, ._3iyw ._3mzw,
-textarea, ._24pi, ._4en9, ._1kb, ._5p7j, ._2klz, ._5780, ._5781, ._5782,
-._3u9u, ._3u9_, ._3u9s, ._1hcx, ._2066, ._1_-1, ._cv_, ._1nbx, ._2cuh,
-._4ms9, ._4ms5, ._4ms6, ._31b4, ._31b5, ._5q_r, ._idb, ._38d-, ._3n8y, ._38dt, ._3oyg,
-._27vp, ._4nwe, ._4nw9, ._27vi, .appCenterAppInfo, .appCenterPermissions,
-._3c9l, ._3c9m, ._4jn_, ._32qt, ._3mom, ._3moo, ._-7o, ._d00, ._d01, ._559g,
-._2new, .appCenterCategorySelectorButton, ._1ksq, ._1kt6, ._6ber, ._mxb, ._3oyd,
+textarea:not([style*="color: rgb"]), ._24pi, ._4en9, ._1kb, ._5p7j, ._2klz, ._5780, ._5781, ._5782,
+._3u9u, ._3u9_, ._3u9s, ._1hcx, ._2066, ._1_-1, ._cv_, ._1nbx, ._2cuh, ._6--d, ._77p7, ._7h_g,
+._4ms9, ._4ms5, ._4ms6, ._31b4, ._31b5, ._5q_r, ._idb, ._38d-, ._3n8y, ._38dt, ._3oyg, ._21dc,
+._27vp, ._4nwe, ._4nw9, ._27vi, .appCenterAppInfo, .appCenterPermissions, ._6xqt, ._7cui,
+._3c9l, ._3c9m, ._4jn_, ._32qt, ._3mom, ._3moo, ._-7o, ._d00, ._d01, ._559g, ._7cdj,
+._2new, .appCenterCategorySelectorButton, ._1ksq, ._1kt6, ._6ber, ._mxb, ._3oyd, ._3gir, ._3gis,
 div.sharerSelector, .footer, ._4pv_, ._1dbp, ._3kad, ._20zc, ._2i5v, ._2i5w,
 a, ._5fpq, ._4gux, ._3bg5 ._52x1, ._3bg5 ._52x2, ._6dsj ._3gin, ._hdn._hdn,
-.mentions-input, .mentions-placeholder, .largeStatusBox .placeHolder, .fcw,
+.mentions-input:not([style*="color: rgb"]), .mentions-placeholder:not([style*="color: rgb"]),
+.largeStatusBox .placeHolder, .fcw, ._2rgt, ._67i4 ._5hu6 ._59tt,
 ._5-7t, .fcl, ._4qas, .thread-title, .title, ._46pa, ._336p, ._1rrd, ._2om4,
 ._3m1m, ._2om2, ._5n_e, .appListExplanation, ._5yt8, ._8he, ._2luw, ._5rgs,
 h1, h2, h3, h4, h5, h6 {
@@ -41,9 +42,9 @@ p > a, .msg span > a {
   background: #000 !important;
 }
 
-body, :root, #root, #header, #MComposer, [style*=background-color], ._1upc, input, ._2f9r, ._59e9, ._5pz4, ._5lp4,
+body, :root, #root, #header, #MComposer, ._1upc, input, ._2f9r, ._59e9, ._5pz4, ._5lp4,
 ._5lp5, .container, .subpage, ._5n_f, #static_templates, ._22_8, ._1t4h, ._uoq, ._3qdh, ._8ca, ._3h8i,
-._6-l ._2us7, ._6-l ._6-p, ._333v, div.sharerSelector, ._529j, ._305j, ._1pph, ._3t_l, ._4pvz,
+._6-l ._2us7, ._6-l ._6-p:not([style*="background-image:"]), ._333v, div.sharerSelector, ._529j, ._305j, ._1pph, ._3t_l, ._4pvz,
 ._1g05, .acy, ._51-g, ._533c, ._ib-, .sharerAttachmentEmpty, .sharerBottomWrapper, ._24e1, ._-j7,
 ._3bg5 ._56do, ._5hfh, ._52e-, .mQuestionsPollResultsBar, ._5hoc, ._5oxw, ._32_4, ._1hiz,
 ._38do, .bo, .cq, ._234-, ._a-5, ._2zh4, ._15ks, ._3oyc, ._36dc, ._3iyw ._3iyx, ._6bes, ._55wo, ._4-dy,
@@ -56,7 +57,7 @@ body, :root, #root, #header, #MComposer, [style*=background-color], ._1upc, inpu
 ._5c9u, div._5y57::before, ._59f6._55so::before, .structuredPublisher, ._94v, ._vqv, ._5lp5,
 ._55wm, ._2om3, ._2ol-, ._1f9d, ._vee, ._31a-, ._3r8b, ._3r9d, ._5vq5, ._3tl8, ._65wz, ._4edl,
 .acw, ._4_xl, ._1p70, ._1p70, ._1ih_, ._51v6, ._u2c, ._484w, ._3ils, ._rm7, ._32qk, ._d01, ._1glm,
-._ue6, ._hdn._hdn,
+._ue6, ._hdn._hdn, ._6vzw, ._77xj, ._38nq, ._9_7, ._51li,
 ._2y60, ._5fu3, ._2foa, ._2y5_, ._38o9, ._1kb, .mAppCenterFatLabel, ._3bmj, ._5zmb, ._2x2s, ._3kac, ._3kad,
 ._3f50, .mentions-placeholder, .mentions, .mentions-measurer, .acg, ._59tu,
 ._4l9b, ._4gj3, .groupChromeView, ._i3g, ._3jcf, .error, ._1dbp, ._5zma, ._6beq, ._vi6,
@@ -65,7 +66,7 @@ body, :root, #root, #header, #MComposer, [style*=background-color], ._1upc, inpu
   background: #000 !important;
 }
 
-._31nf, ._2v9s, ._d4i, article._55wo, ._10c_, ._2jl2, ._55wo, ._6150, ._50mi, ._4-dw, ._4_2z, ._5m_s {
+._31nf, ._2v9s, ._d4i, article._55wo, ._10c_, ._2jl2, ._6150, ._50mi, ._4-dw, ._4_2z, ._5m_s, ._13fn {
   background: rgba(0, 0, 0, 0.35) !important;
 }
 
@@ -93,11 +94,11 @@ body, :root, #root, #header, #MComposer, [style*=background-color], ._1upc, inpu
 button:not([style*=image]):not(.privacyButtons), button::before, .touch ._56bt, ._56be::before, .btnS, .touch::before,
 ._590n, ._4g8h, ._2cpp, ._58a0.touched:after,
 .timeline .timelinePublisher, .touched, .sharerAttachment,
-.item a.primary.touched .primarywrap, ._38nq, ._537a,
+.item a.primary.touched .primarywrap, ._537a, ._7cui,
 ._5xo2, ._5u5a::before, ._4u3j, ._15ks, ._5hua, ._59tt, ._41ft, .jx-tokenizer, ._55fj,
 .excessItem, .acr, ._5-lx, ._3g9-, ._55ws, ._6dsj ._3gin, ._69aj,
 ._4e8n, ._5pxa._3uj9, ._5n_5, ._u2d, ._56bu::before, ._5h8f, ._d00, ._2066, ._2k51,
-._10sb li.selected, ._2z4j, ._ib-, ._1bhl, ._5a5j,
+._10sb li.selected, ._2z4j, ._ib-, ._1bhl, ._5a5j, ._6--d, ._77p7,
 ._2b06, ._2tsf, ._3gka, .mCount, ._27vc, ._4pv-, ._6pk5,
 ._4qax, ._4756, ._w34, ._56bv::before, ._5769, ._34iv, ._z-w, ._t21, .mToken,
 #addMembersTypeahead .mToken.mTokenWeakReference,
@@ -124,14 +125,14 @@ button ._v89 ._54k8._1fl1 {
   border-left: 1px solid rgba(255, 255, 255, 0.3) !important;
 }
 
-._4_d1, ._5cni {
+._4_d1, ._5cni, ._3jcq {
   border-right: 1px solid rgba(255, 255, 255, 0.3) !important;
 }
 
 ._1mx0, ._1rbr, ._5yt8, ._idb, ._cld, ._1e8h, ._z-w, ._1ha, ._1n8h ._1oby, ._5f99, ._2t39,
-._2pbp, ._5rou:first-child, ._egf:first-child, ._io2, ._3qdi ._48_m::after,
+._2pbp, ._5rou:first-child, ._egf:first-child, ._io2, ._3qdi ._48_m::after, ._46dd::before,
 ._15n_, ._3-2-, ._27ve, ._2s20, ._gui, ._2s21 > *::after, ._32qk, ._d00, ._d01, ._38o9,
-._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils, ._5as0, ._5as2,
+._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils, ._5as0, ._5as2, ._5-lw,
 ._52x1, ._3wjp, ._usq, ._2cul:before, ._13e_, .jewel .flyout, ._3bg5 ._52x6, ._56d8, .al {
   border-top: 1px solid rgba(255, 255, 255, 0.3) !important;
 }
@@ -143,7 +144,7 @@ button ._v89 ._54k8._1fl1 {
 .mAppCenterFatLabel, .appCenterCategorySelectorButton, ._1q6v, ._5q_r, ._5yt8, ._38do, ._38dt,
 ._ap1, ._52x1, ._59tu, ._usq, ._13e_, ._59f6._55so::before, ._4gj3, .error, ._35--, ._1wev,
 .jx-result, ._1f9d, ._vef, ._55x2 > *, .al, ._44qk, ._5rgs, ._5xuj, ._1sv1, ._idb,
-._5lp5, ._3-2-, ._3to6, ._ir5, ._4nw6, ._4nwh, ._27ve, div._51v6::before,
+._5lp5, ._3-2-, ._3to6, ._ir5, ._4nw6, ._4nwh, ._27ve, div._51v6::before, ._5hu6,
 ._3c9h::before, ._2s20, ._gui, ._5jku, ._2foa, ._2y60, ._5fu3, ._4en9, ._1kb:not(:last-child) ._1kc,
 ._5pz4, ._5lp4, ._5lp5, ._5h6z, ._5h6x, ._2om4, ._5fjw > div, ._5fjv > :first-child,
 ._5fjw > :first-child {
@@ -163,7 +164,7 @@ button ._v89 ._54k8._1fl1 {
 ._1_y5, ._lr0, ._5hgt, ._2cpp, ._50uu, ._50uw, ._31yd, ._1e3d, ._3xz7, ._1xoz,
 ._4kcb, ._2lut, .jewel .touchable-notification.touched, .touchable-notification .touchable.touched,
 .home-notification .touchable.touched, ._6beo ._6ber,
-._73ku ._73jw,
+._73ku ._73jw, ._6--d, ._26vk._56bt,
 ._4e8n, ._uww, .mentions-placeholder, .mentions-shadow, .mentions-measurer,
 ._5whq, ._59tt, ._41ft::after, .jx-tokenizer, ._3uqf, ._4756, ._1rrd, ._5n_f {
   border: 1px solid rgba(255, 255, 255, 0.3) !important;
diff --git a/app/src/web/assets/css/themes/material_dark.css b/app/src/web/assets/css/themes/material_dark.css
index 3b5a4364..b9799018 100644
--- a/app/src/web/assets/css/themes/material_dark.css
+++ b/app/src/web/assets/css/themes/material_dark.css
@@ -1,4 +1,4 @@
-[style*=color], body, input, ._42rv, ._4qau, ._dwm .descArea, ._eu5,
+body, input, ._42rv, ._4qau, ._dwm .descArea, ._eu5,
 ._1tcc, ._3g9-, ._29z_, ._3xz7, ._ib-, ._3bg5 ._56dq, ._477i, ._2vxk,
 .touched *, ._1_yj, ._1_yl, ._4pj9, ._2bdc, ._3qdh ._3qdn ._3qdk, ._3qdk ._48_q,
 ._z-z, ._z-v, ._1e8d, ._36nl, ._36nm, ._2_11, ._2_rf, ._2ip_, ._403p, .cq, ._usr,
@@ -10,15 +10,16 @@
 ._18qg, ._1_ac, ._529p, ._4dwt ._1vh3, ._4a5f, ._23_t, ._2rzc, ._23_s, ._2rzd,
 ._5aga, ._5ag9, ._537a, .acy, ._5ro_, ._6-l ._2us7, ._4mp, ._2b08, ._36e0, ._4-dy,
 ._14v5 ._14v8, ._1440, ._1442, ._1448, ._4ks_, .mCount, ._27vc, ._24e1, ._2rbw, ._3iyw ._3mzw,
-textarea, ._24pi, ._4en9, ._1kb, ._5p7j, ._2klz, ._5780, ._5781, ._5782,
-._3u9u, ._3u9_, ._3u9s, ._1hcx, ._2066, ._1_-1, ._cv_, ._1nbx, ._2cuh,
-._4ms9, ._4ms5, ._4ms6, ._31b4, ._31b5, ._5q_r, ._idb, ._38d-, ._3n8y, ._38dt, ._3oyg,
-._27vp, ._4nwe, ._4nw9, ._27vi, .appCenterAppInfo, .appCenterPermissions,
-._3c9l, ._3c9m, ._4jn_, ._32qt, ._3mom, ._3moo, ._-7o, ._d00, ._d01, ._559g,
-._2new, .appCenterCategorySelectorButton, ._1ksq, ._1kt6, ._6ber, ._mxb, ._3oyd,
+textarea:not([style*="color: rgb"]), ._24pi, ._4en9, ._1kb, ._5p7j, ._2klz, ._5780, ._5781, ._5782,
+._3u9u, ._3u9_, ._3u9s, ._1hcx, ._2066, ._1_-1, ._cv_, ._1nbx, ._2cuh, ._6--d, ._77p7, ._7h_g,
+._4ms9, ._4ms5, ._4ms6, ._31b4, ._31b5, ._5q_r, ._idb, ._38d-, ._3n8y, ._38dt, ._3oyg, ._21dc,
+._27vp, ._4nwe, ._4nw9, ._27vi, .appCenterAppInfo, .appCenterPermissions, ._6xqt, ._7cui,
+._3c9l, ._3c9m, ._4jn_, ._32qt, ._3mom, ._3moo, ._-7o, ._d00, ._d01, ._559g, ._7cdj,
+._2new, .appCenterCategorySelectorButton, ._1ksq, ._1kt6, ._6ber, ._mxb, ._3oyd, ._3gir, ._3gis,
 div.sharerSelector, .footer, ._4pv_, ._1dbp, ._3kad, ._20zc, ._2i5v, ._2i5w,
 a, ._5fpq, ._4gux, ._3bg5 ._52x1, ._3bg5 ._52x2, ._6dsj ._3gin, ._hdn._hdn,
-.mentions-input, .mentions-placeholder, .largeStatusBox .placeHolder, .fcw,
+.mentions-input:not([style*="color: rgb"]), .mentions-placeholder:not([style*="color: rgb"]),
+.largeStatusBox .placeHolder, .fcw, ._2rgt, ._67i4 ._5hu6 ._59tt,
 ._5-7t, .fcl, ._4qas, .thread-title, .title, ._46pa, ._336p, ._1rrd, ._2om4,
 ._3m1m, ._2om2, ._5n_e, .appListExplanation, ._5yt8, ._8he, ._2luw, ._5rgs,
 h1, h2, h3, h4, h5, h6 {
@@ -41,9 +42,9 @@ p > a, .msg span > a {
   background: #303030 !important;
 }
 
-body, :root, #root, #header, #MComposer, [style*=background-color], ._1upc, input, ._2f9r, ._59e9, ._5pz4, ._5lp4,
+body, :root, #root, #header, #MComposer, ._1upc, input, ._2f9r, ._59e9, ._5pz4, ._5lp4,
 ._5lp5, .container, .subpage, ._5n_f, #static_templates, ._22_8, ._1t4h, ._uoq, ._3qdh, ._8ca, ._3h8i,
-._6-l ._2us7, ._6-l ._6-p, ._333v, div.sharerSelector, ._529j, ._305j, ._1pph, ._3t_l, ._4pvz,
+._6-l ._2us7, ._6-l ._6-p:not([style*="background-image:"]), ._333v, div.sharerSelector, ._529j, ._305j, ._1pph, ._3t_l, ._4pvz,
 ._1g05, .acy, ._51-g, ._533c, ._ib-, .sharerAttachmentEmpty, .sharerBottomWrapper, ._24e1, ._-j7,
 ._3bg5 ._56do, ._5hfh, ._52e-, .mQuestionsPollResultsBar, ._5hoc, ._5oxw, ._32_4, ._1hiz,
 ._38do, .bo, .cq, ._234-, ._a-5, ._2zh4, ._15ks, ._3oyc, ._36dc, ._3iyw ._3iyx, ._6bes, ._55wo, ._4-dy,
@@ -56,7 +57,7 @@ body, :root, #root, #header, #MComposer, [style*=background-color], ._1upc, inpu
 ._5c9u, div._5y57::before, ._59f6._55so::before, .structuredPublisher, ._94v, ._vqv, ._5lp5,
 ._55wm, ._2om3, ._2ol-, ._1f9d, ._vee, ._31a-, ._3r8b, ._3r9d, ._5vq5, ._3tl8, ._65wz, ._4edl,
 .acw, ._4_xl, ._1p70, ._1p70, ._1ih_, ._51v6, ._u2c, ._484w, ._3ils, ._rm7, ._32qk, ._d01, ._1glm,
-._ue6, ._hdn._hdn,
+._ue6, ._hdn._hdn, ._6vzw, ._77xj, ._38nq, ._9_7, ._51li,
 ._2y60, ._5fu3, ._2foa, ._2y5_, ._38o9, ._1kb, .mAppCenterFatLabel, ._3bmj, ._5zmb, ._2x2s, ._3kac, ._3kad,
 ._3f50, .mentions-placeholder, .mentions, .mentions-measurer, .acg, ._59tu,
 ._4l9b, ._4gj3, .groupChromeView, ._i3g, ._3jcf, .error, ._1dbp, ._5zma, ._6beq, ._vi6,
@@ -65,7 +66,7 @@ body, :root, #root, #header, #MComposer, [style*=background-color], ._1upc, inpu
   background: #303030 !important;
 }
 
-._31nf, ._2v9s, ._d4i, article._55wo, ._10c_, ._2jl2, ._55wo, ._6150, ._50mi, ._4-dw, ._4_2z, ._5m_s {
+._31nf, ._2v9s, ._d4i, article._55wo, ._10c_, ._2jl2, ._6150, ._50mi, ._4-dw, ._4_2z, ._5m_s, ._13fn {
   background: #353535 !important;
 }
 
@@ -93,11 +94,11 @@ body, :root, #root, #header, #MComposer, [style*=background-color], ._1upc, inpu
 button:not([style*=image]):not(.privacyButtons), button::before, .touch ._56bt, ._56be::before, .btnS, .touch::before,
 ._590n, ._4g8h, ._2cpp, ._58a0.touched:after,
 .timeline .timelinePublisher, .touched, .sharerAttachment,
-.item a.primary.touched .primarywrap, ._38nq, ._537a,
+.item a.primary.touched .primarywrap, ._537a, ._7cui,
 ._5xo2, ._5u5a::before, ._4u3j, ._15ks, ._5hua, ._59tt, ._41ft, .jx-tokenizer, ._55fj,
 .excessItem, .acr, ._5-lx, ._3g9-, ._55ws, ._6dsj ._3gin, ._69aj,
 ._4e8n, ._5pxa._3uj9, ._5n_5, ._u2d, ._56bu::before, ._5h8f, ._d00, ._2066, ._2k51,
-._10sb li.selected, ._2z4j, ._ib-, ._1bhl, ._5a5j,
+._10sb li.selected, ._2z4j, ._ib-, ._1bhl, ._5a5j, ._6--d, ._77p7,
 ._2b06, ._2tsf, ._3gka, .mCount, ._27vc, ._4pv-, ._6pk5,
 ._4qax, ._4756, ._w34, ._56bv::before, ._5769, ._34iv, ._z-w, ._t21, .mToken,
 #addMembersTypeahead .mToken.mTokenWeakReference,
@@ -124,14 +125,14 @@ button ._v89 ._54k8._1fl1 {
   border-left: 1px solid rgba(255, 255, 255, 0.3) !important;
 }
 
-._4_d1, ._5cni {
+._4_d1, ._5cni, ._3jcq {
   border-right: 1px solid rgba(255, 255, 255, 0.3) !important;
 }
 
 ._1mx0, ._1rbr, ._5yt8, ._idb, ._cld, ._1e8h, ._z-w, ._1ha, ._1n8h ._1oby, ._5f99, ._2t39,
-._2pbp, ._5rou:first-child, ._egf:first-child, ._io2, ._3qdi ._48_m::after,
+._2pbp, ._5rou:first-child, ._egf:first-child, ._io2, ._3qdi ._48_m::after, ._46dd::before,
 ._15n_, ._3-2-, ._27ve, ._2s20, ._gui, ._2s21 > *::after, ._32qk, ._d00, ._d01, ._38o9,
-._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils, ._5as0, ._5as2,
+._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils, ._5as0, ._5as2, ._5-lw,
 ._52x1, ._3wjp, ._usq, ._2cul:before, ._13e_, .jewel .flyout, ._3bg5 ._52x6, ._56d8, .al {
   border-top: 1px solid rgba(255, 255, 255, 0.3) !important;
 }
@@ -143,7 +144,7 @@ button ._v89 ._54k8._1fl1 {
 .mAppCenterFatLabel, .appCenterCategorySelectorButton, ._1q6v, ._5q_r, ._5yt8, ._38do, ._38dt,
 ._ap1, ._52x1, ._59tu, ._usq, ._13e_, ._59f6._55so::before, ._4gj3, .error, ._35--, ._1wev,
 .jx-result, ._1f9d, ._vef, ._55x2 > *, .al, ._44qk, ._5rgs, ._5xuj, ._1sv1, ._idb,
-._5lp5, ._3-2-, ._3to6, ._ir5, ._4nw6, ._4nwh, ._27ve, div._51v6::before,
+._5lp5, ._3-2-, ._3to6, ._ir5, ._4nw6, ._4nwh, ._27ve, div._51v6::before, ._5hu6,
 ._3c9h::before, ._2s20, ._gui, ._5jku, ._2foa, ._2y60, ._5fu3, ._4en9, ._1kb:not(:last-child) ._1kc,
 ._5pz4, ._5lp4, ._5lp5, ._5h6z, ._5h6x, ._2om4, ._5fjw > div, ._5fjv > :first-child,
 ._5fjw > :first-child {
@@ -163,7 +164,7 @@ button ._v89 ._54k8._1fl1 {
 ._1_y5, ._lr0, ._5hgt, ._2cpp, ._50uu, ._50uw, ._31yd, ._1e3d, ._3xz7, ._1xoz,
 ._4kcb, ._2lut, .jewel .touchable-notification.touched, .touchable-notification .touchable.touched,
 .home-notification .touchable.touched, ._6beo ._6ber,
-._73ku ._73jw,
+._73ku ._73jw, ._6--d, ._26vk._56bt,
 ._4e8n, ._uww, .mentions-placeholder, .mentions-shadow, .mentions-measurer,
 ._5whq, ._59tt, ._41ft::after, .jx-tokenizer, ._3uqf, ._4756, ._1rrd, ._5n_f {
   border: 1px solid rgba(255, 255, 255, 0.3) !important;
diff --git a/app/src/web/assets/css/themes/material_glass.css b/app/src/web/assets/css/themes/material_glass.css
index b1df20c0..8e7656b4 100644
--- a/app/src/web/assets/css/themes/material_glass.css
+++ b/app/src/web/assets/css/themes/material_glass.css
@@ -1,4 +1,4 @@
-[style*=color], body, input, ._42rv, ._4qau, ._dwm .descArea, ._eu5,
+body, input, ._42rv, ._4qau, ._dwm .descArea, ._eu5,
 ._1tcc, ._3g9-, ._29z_, ._3xz7, ._ib-, ._3bg5 ._56dq, ._477i, ._2vxk,
 .touched *, ._1_yj, ._1_yl, ._4pj9, ._2bdc, ._3qdh ._3qdn ._3qdk, ._3qdk ._48_q,
 ._z-z, ._z-v, ._1e8d, ._36nl, ._36nm, ._2_11, ._2_rf, ._2ip_, ._403p, .cq, ._usr,
@@ -10,15 +10,16 @@
 ._18qg, ._1_ac, ._529p, ._4dwt ._1vh3, ._4a5f, ._23_t, ._2rzc, ._23_s, ._2rzd,
 ._5aga, ._5ag9, ._537a, .acy, ._5ro_, ._6-l ._2us7, ._4mp, ._2b08, ._36e0, ._4-dy,
 ._14v5 ._14v8, ._1440, ._1442, ._1448, ._4ks_, .mCount, ._27vc, ._24e1, ._2rbw, ._3iyw ._3mzw,
-textarea, ._24pi, ._4en9, ._1kb, ._5p7j, ._2klz, ._5780, ._5781, ._5782,
-._3u9u, ._3u9_, ._3u9s, ._1hcx, ._2066, ._1_-1, ._cv_, ._1nbx, ._2cuh,
-._4ms9, ._4ms5, ._4ms6, ._31b4, ._31b5, ._5q_r, ._idb, ._38d-, ._3n8y, ._38dt, ._3oyg,
-._27vp, ._4nwe, ._4nw9, ._27vi, .appCenterAppInfo, .appCenterPermissions,
-._3c9l, ._3c9m, ._4jn_, ._32qt, ._3mom, ._3moo, ._-7o, ._d00, ._d01, ._559g,
-._2new, .appCenterCategorySelectorButton, ._1ksq, ._1kt6, ._6ber, ._mxb, ._3oyd,
+textarea:not([style*="color: rgb"]), ._24pi, ._4en9, ._1kb, ._5p7j, ._2klz, ._5780, ._5781, ._5782,
+._3u9u, ._3u9_, ._3u9s, ._1hcx, ._2066, ._1_-1, ._cv_, ._1nbx, ._2cuh, ._6--d, ._77p7, ._7h_g,
+._4ms9, ._4ms5, ._4ms6, ._31b4, ._31b5, ._5q_r, ._idb, ._38d-, ._3n8y, ._38dt, ._3oyg, ._21dc,
+._27vp, ._4nwe, ._4nw9, ._27vi, .appCenterAppInfo, .appCenterPermissions, ._6xqt, ._7cui,
+._3c9l, ._3c9m, ._4jn_, ._32qt, ._3mom, ._3moo, ._-7o, ._d00, ._d01, ._559g, ._7cdj,
+._2new, .appCenterCategorySelectorButton, ._1ksq, ._1kt6, ._6ber, ._mxb, ._3oyd, ._3gir, ._3gis,
 div.sharerSelector, .footer, ._4pv_, ._1dbp, ._3kad, ._20zc, ._2i5v, ._2i5w,
 a, ._5fpq, ._4gux, ._3bg5 ._52x1, ._3bg5 ._52x2, ._6dsj ._3gin, ._hdn._hdn,
-.mentions-input, .mentions-placeholder, .largeStatusBox .placeHolder, .fcw,
+.mentions-input:not([style*="color: rgb"]), .mentions-placeholder:not([style*="color: rgb"]),
+.largeStatusBox .placeHolder, .fcw, ._2rgt, ._67i4 ._5hu6 ._59tt,
 ._5-7t, .fcl, ._4qas, .thread-title, .title, ._46pa, ._336p, ._1rrd, ._2om4,
 ._3m1m, ._2om2, ._5n_e, .appListExplanation, ._5yt8, ._8he, ._2luw, ._5rgs,
 h1, h2, h3, h4, h5, h6 {
@@ -41,9 +42,9 @@ p > a, .msg span > a {
   background: rgba(0, 0, 0, 0.1) !important;
 }
 
-body, :root, #root, #header, #MComposer, [style*=background-color], ._1upc, input, ._2f9r, ._59e9, ._5pz4, ._5lp4,
+body, :root, #root, #header, #MComposer, ._1upc, input, ._2f9r, ._59e9, ._5pz4, ._5lp4,
 ._5lp5, .container, .subpage, ._5n_f, #static_templates, ._22_8, ._1t4h, ._uoq, ._3qdh, ._8ca, ._3h8i,
-._6-l ._2us7, ._6-l ._6-p, ._333v, div.sharerSelector, ._529j, ._305j, ._1pph, ._3t_l, ._4pvz,
+._6-l ._2us7, ._6-l ._6-p:not([style*="background-image:"]), ._333v, div.sharerSelector, ._529j, ._305j, ._1pph, ._3t_l, ._4pvz,
 ._1g05, .acy, ._51-g, ._533c, ._ib-, .sharerAttachmentEmpty, .sharerBottomWrapper, ._24e1, ._-j7,
 ._3bg5 ._56do, ._5hfh, ._52e-, .mQuestionsPollResultsBar, ._5hoc, ._5oxw, ._32_4, ._1hiz,
 ._38do, .bo, .cq, ._234-, ._a-5, ._2zh4, ._15ks, ._3oyc, ._36dc, ._3iyw ._3iyx, ._6bes, ._55wo, ._4-dy,
@@ -56,7 +57,7 @@ body, :root, #root, #header, #MComposer, [style*=background-color], ._1upc, inpu
 ._5c9u, div._5y57::before, ._59f6._55so::before, .structuredPublisher, ._94v, ._vqv, ._5lp5,
 ._55wm, ._2om3, ._2ol-, ._1f9d, ._vee, ._31a-, ._3r8b, ._3r9d, ._5vq5, ._3tl8, ._65wz, ._4edl,
 .acw, ._4_xl, ._1p70, ._1p70, ._1ih_, ._51v6, ._u2c, ._484w, ._3ils, ._rm7, ._32qk, ._d01, ._1glm,
-._ue6, ._hdn._hdn,
+._ue6, ._hdn._hdn, ._6vzw, ._77xj, ._38nq, ._9_7, ._51li,
 ._2y60, ._5fu3, ._2foa, ._2y5_, ._38o9, ._1kb, .mAppCenterFatLabel, ._3bmj, ._5zmb, ._2x2s, ._3kac, ._3kad,
 ._3f50, .mentions-placeholder, .mentions, .mentions-measurer, .acg, ._59tu,
 ._4l9b, ._4gj3, .groupChromeView, ._i3g, ._3jcf, .error, ._1dbp, ._5zma, ._6beq, ._vi6,
@@ -65,7 +66,7 @@ body, :root, #root, #header, #MComposer, [style*=background-color], ._1upc, inpu
   background: transparent !important;
 }
 
-._31nf, ._2v9s, ._d4i, article._55wo, ._10c_, ._2jl2, ._55wo, ._6150, ._50mi, ._4-dw, ._4_2z, ._5m_s {
+._31nf, ._2v9s, ._d4i, article._55wo, ._10c_, ._2jl2, ._6150, ._50mi, ._4-dw, ._4_2z, ._5m_s, ._13fn {
   background: rgba(0, 0, 0, 0.25) !important;
 }
 
@@ -93,11 +94,11 @@ body, :root, #root, #header, #MComposer, [style*=background-color], ._1upc, inpu
 button:not([style*=image]):not(.privacyButtons), button::before, .touch ._56bt, ._56be::before, .btnS, .touch::before,
 ._590n, ._4g8h, ._2cpp, ._58a0.touched:after,
 .timeline .timelinePublisher, .touched, .sharerAttachment,
-.item a.primary.touched .primarywrap, ._38nq, ._537a,
+.item a.primary.touched .primarywrap, ._537a, ._7cui,
 ._5xo2, ._5u5a::before, ._4u3j, ._15ks, ._5hua, ._59tt, ._41ft, .jx-tokenizer, ._55fj,
 .excessItem, .acr, ._5-lx, ._3g9-, ._55ws, ._6dsj ._3gin, ._69aj,
 ._4e8n, ._5pxa._3uj9, ._5n_5, ._u2d, ._56bu::before, ._5h8f, ._d00, ._2066, ._2k51,
-._10sb li.selected, ._2z4j, ._ib-, ._1bhl, ._5a5j,
+._10sb li.selected, ._2z4j, ._ib-, ._1bhl, ._5a5j, ._6--d, ._77p7,
 ._2b06, ._2tsf, ._3gka, .mCount, ._27vc, ._4pv-, ._6pk5,
 ._4qax, ._4756, ._w34, ._56bv::before, ._5769, ._34iv, ._z-w, ._t21, .mToken,
 #addMembersTypeahead .mToken.mTokenWeakReference,
@@ -124,14 +125,14 @@ button ._v89 ._54k8._1fl1 {
   border-left: 1px solid rgba(255, 255, 255, 0.3) !important;
 }
 
-._4_d1, ._5cni {
+._4_d1, ._5cni, ._3jcq {
   border-right: 1px solid rgba(255, 255, 255, 0.3) !important;
 }
 
 ._1mx0, ._1rbr, ._5yt8, ._idb, ._cld, ._1e8h, ._z-w, ._1ha, ._1n8h ._1oby, ._5f99, ._2t39,
-._2pbp, ._5rou:first-child, ._egf:first-child, ._io2, ._3qdi ._48_m::after,
+._2pbp, ._5rou:first-child, ._egf:first-child, ._io2, ._3qdi ._48_m::after, ._46dd::before,
 ._15n_, ._3-2-, ._27ve, ._2s20, ._gui, ._2s21 > *::after, ._32qk, ._d00, ._d01, ._38o9,
-._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils, ._5as0, ._5as2,
+._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils, ._5as0, ._5as2, ._5-lw,
 ._52x1, ._3wjp, ._usq, ._2cul:before, ._13e_, .jewel .flyout, ._3bg5 ._52x6, ._56d8, .al {
   border-top: 1px solid rgba(255, 255, 255, 0.3) !important;
 }
@@ -143,7 +144,7 @@ button ._v89 ._54k8._1fl1 {
 .mAppCenterFatLabel, .appCenterCategorySelectorButton, ._1q6v, ._5q_r, ._5yt8, ._38do, ._38dt,
 ._ap1, ._52x1, ._59tu, ._usq, ._13e_, ._59f6._55so::before, ._4gj3, .error, ._35--, ._1wev,
 .jx-result, ._1f9d, ._vef, ._55x2 > *, .al, ._44qk, ._5rgs, ._5xuj, ._1sv1, ._idb,
-._5lp5, ._3-2-, ._3to6, ._ir5, ._4nw6, ._4nwh, ._27ve, div._51v6::before,
+._5lp5, ._3-2-, ._3to6, ._ir5, ._4nw6, ._4nwh, ._27ve, div._51v6::before, ._5hu6,
 ._3c9h::before, ._2s20, ._gui, ._5jku, ._2foa, ._2y60, ._5fu3, ._4en9, ._1kb:not(:last-child) ._1kc,
 ._5pz4, ._5lp4, ._5lp5, ._5h6z, ._5h6x, ._2om4, ._5fjw > div, ._5fjv > :first-child,
 ._5fjw > :first-child {
@@ -163,7 +164,7 @@ button ._v89 ._54k8._1fl1 {
 ._1_y5, ._lr0, ._5hgt, ._2cpp, ._50uu, ._50uw, ._31yd, ._1e3d, ._3xz7, ._1xoz,
 ._4kcb, ._2lut, .jewel .touchable-notification.touched, .touchable-notification .touchable.touched,
 .home-notification .touchable.touched, ._6beo ._6ber,
-._73ku ._73jw,
+._73ku ._73jw, ._6--d, ._26vk._56bt,
 ._4e8n, ._uww, .mentions-placeholder, .mentions-shadow, .mentions-measurer,
 ._5whq, ._59tt, ._41ft::after, .jx-tokenizer, ._3uqf, ._4756, ._1rrd, ._5n_f {
   border: 1px solid rgba(255, 255, 255, 0.3) !important;
diff --git a/app/src/web/assets/css/themes/material_light.css b/app/src/web/assets/css/themes/material_light.css
index 78f26e83..fb738862 100644
--- a/app/src/web/assets/css/themes/material_light.css
+++ b/app/src/web/assets/css/themes/material_light.css
@@ -1,4 +1,4 @@
-[style*=color], body, input, ._42rv, ._4qau, ._dwm .descArea, ._eu5,
+body, input, ._42rv, ._4qau, ._dwm .descArea, ._eu5,
 ._1tcc, ._3g9-, ._29z_, ._3xz7, ._ib-, ._3bg5 ._56dq, ._477i, ._2vxk,
 .touched *, ._1_yj, ._1_yl, ._4pj9, ._2bdc, ._3qdh ._3qdn ._3qdk, ._3qdk ._48_q,
 ._z-z, ._z-v, ._1e8d, ._36nl, ._36nm, ._2_11, ._2_rf, ._2ip_, ._403p, .cq, ._usr,
@@ -10,15 +10,16 @@
 ._18qg, ._1_ac, ._529p, ._4dwt ._1vh3, ._4a5f, ._23_t, ._2rzc, ._23_s, ._2rzd,
 ._5aga, ._5ag9, ._537a, .acy, ._5ro_, ._6-l ._2us7, ._4mp, ._2b08, ._36e0, ._4-dy,
 ._14v5 ._14v8, ._1440, ._1442, ._1448, ._4ks_, .mCount, ._27vc, ._24e1, ._2rbw, ._3iyw ._3mzw,
-textarea, ._24pi, ._4en9, ._1kb, ._5p7j, ._2klz, ._5780, ._5781, ._5782,
-._3u9u, ._3u9_, ._3u9s, ._1hcx, ._2066, ._1_-1, ._cv_, ._1nbx, ._2cuh,
-._4ms9, ._4ms5, ._4ms6, ._31b4, ._31b5, ._5q_r, ._idb, ._38d-, ._3n8y, ._38dt, ._3oyg,
-._27vp, ._4nwe, ._4nw9, ._27vi, .appCenterAppInfo, .appCenterPermissions,
-._3c9l, ._3c9m, ._4jn_, ._32qt, ._3mom, ._3moo, ._-7o, ._d00, ._d01, ._559g,
-._2new, .appCenterCategorySelectorButton, ._1ksq, ._1kt6, ._6ber, ._mxb, ._3oyd,
+textarea:not([style*="color: rgb"]), ._24pi, ._4en9, ._1kb, ._5p7j, ._2klz, ._5780, ._5781, ._5782,
+._3u9u, ._3u9_, ._3u9s, ._1hcx, ._2066, ._1_-1, ._cv_, ._1nbx, ._2cuh, ._6--d, ._77p7, ._7h_g,
+._4ms9, ._4ms5, ._4ms6, ._31b4, ._31b5, ._5q_r, ._idb, ._38d-, ._3n8y, ._38dt, ._3oyg, ._21dc,
+._27vp, ._4nwe, ._4nw9, ._27vi, .appCenterAppInfo, .appCenterPermissions, ._6xqt, ._7cui,
+._3c9l, ._3c9m, ._4jn_, ._32qt, ._3mom, ._3moo, ._-7o, ._d00, ._d01, ._559g, ._7cdj,
+._2new, .appCenterCategorySelectorButton, ._1ksq, ._1kt6, ._6ber, ._mxb, ._3oyd, ._3gir, ._3gis,
 div.sharerSelector, .footer, ._4pv_, ._1dbp, ._3kad, ._20zc, ._2i5v, ._2i5w,
 a, ._5fpq, ._4gux, ._3bg5 ._52x1, ._3bg5 ._52x2, ._6dsj ._3gin, ._hdn._hdn,
-.mentions-input, .mentions-placeholder, .largeStatusBox .placeHolder, .fcw,
+.mentions-input:not([style*="color: rgb"]), .mentions-placeholder:not([style*="color: rgb"]),
+.largeStatusBox .placeHolder, .fcw, ._2rgt, ._67i4 ._5hu6 ._59tt,
 ._5-7t, .fcl, ._4qas, .thread-title, .title, ._46pa, ._336p, ._1rrd, ._2om4,
 ._3m1m, ._2om2, ._5n_e, .appListExplanation, ._5yt8, ._8he, ._2luw, ._5rgs,
 h1, h2, h3, h4, h5, h6 {
@@ -41,9 +42,9 @@ p > a, .msg span > a {
   background: #fafafa !important;
 }
 
-body, :root, #root, #header, #MComposer, [style*=background-color], ._1upc, input, ._2f9r, ._59e9, ._5pz4, ._5lp4,
+body, :root, #root, #header, #MComposer, ._1upc, input, ._2f9r, ._59e9, ._5pz4, ._5lp4,
 ._5lp5, .container, .subpage, ._5n_f, #static_templates, ._22_8, ._1t4h, ._uoq, ._3qdh, ._8ca, ._3h8i,
-._6-l ._2us7, ._6-l ._6-p, ._333v, div.sharerSelector, ._529j, ._305j, ._1pph, ._3t_l, ._4pvz,
+._6-l ._2us7, ._6-l ._6-p:not([style*="background-image:"]), ._333v, div.sharerSelector, ._529j, ._305j, ._1pph, ._3t_l, ._4pvz,
 ._1g05, .acy, ._51-g, ._533c, ._ib-, .sharerAttachmentEmpty, .sharerBottomWrapper, ._24e1, ._-j7,
 ._3bg5 ._56do, ._5hfh, ._52e-, .mQuestionsPollResultsBar, ._5hoc, ._5oxw, ._32_4, ._1hiz,
 ._38do, .bo, .cq, ._234-, ._a-5, ._2zh4, ._15ks, ._3oyc, ._36dc, ._3iyw ._3iyx, ._6bes, ._55wo, ._4-dy,
@@ -56,7 +57,7 @@ body, :root, #root, #header, #MComposer, [style*=background-color], ._1upc, inpu
 ._5c9u, div._5y57::before, ._59f6._55so::before, .structuredPublisher, ._94v, ._vqv, ._5lp5,
 ._55wm, ._2om3, ._2ol-, ._1f9d, ._vee, ._31a-, ._3r8b, ._3r9d, ._5vq5, ._3tl8, ._65wz, ._4edl,
 .acw, ._4_xl, ._1p70, ._1p70, ._1ih_, ._51v6, ._u2c, ._484w, ._3ils, ._rm7, ._32qk, ._d01, ._1glm,
-._ue6, ._hdn._hdn,
+._ue6, ._hdn._hdn, ._6vzw, ._77xj, ._38nq, ._9_7, ._51li,
 ._2y60, ._5fu3, ._2foa, ._2y5_, ._38o9, ._1kb, .mAppCenterFatLabel, ._3bmj, ._5zmb, ._2x2s, ._3kac, ._3kad,
 ._3f50, .mentions-placeholder, .mentions, .mentions-measurer, .acg, ._59tu,
 ._4l9b, ._4gj3, .groupChromeView, ._i3g, ._3jcf, .error, ._1dbp, ._5zma, ._6beq, ._vi6,
@@ -65,7 +66,7 @@ body, :root, #root, #header, #MComposer, [style*=background-color], ._1upc, inpu
   background: #fafafa !important;
 }
 
-._31nf, ._2v9s, ._d4i, article._55wo, ._10c_, ._2jl2, ._55wo, ._6150, ._50mi, ._4-dw, ._4_2z, ._5m_s {
+._31nf, ._2v9s, ._d4i, article._55wo, ._10c_, ._2jl2, ._6150, ._50mi, ._4-dw, ._4_2z, ._5m_s, ._13fn {
   background: #fff !important;
 }
 
@@ -93,11 +94,11 @@ body, :root, #root, #header, #MComposer, [style*=background-color], ._1upc, inpu
 button:not([style*=image]):not(.privacyButtons), button::before, .touch ._56bt, ._56be::before, .btnS, .touch::before,
 ._590n, ._4g8h, ._2cpp, ._58a0.touched:after,
 .timeline .timelinePublisher, .touched, .sharerAttachment,
-.item a.primary.touched .primarywrap, ._38nq, ._537a,
+.item a.primary.touched .primarywrap, ._537a, ._7cui,
 ._5xo2, ._5u5a::before, ._4u3j, ._15ks, ._5hua, ._59tt, ._41ft, .jx-tokenizer, ._55fj,
 .excessItem, .acr, ._5-lx, ._3g9-, ._55ws, ._6dsj ._3gin, ._69aj,
 ._4e8n, ._5pxa._3uj9, ._5n_5, ._u2d, ._56bu::before, ._5h8f, ._d00, ._2066, ._2k51,
-._10sb li.selected, ._2z4j, ._ib-, ._1bhl, ._5a5j,
+._10sb li.selected, ._2z4j, ._ib-, ._1bhl, ._5a5j, ._6--d, ._77p7,
 ._2b06, ._2tsf, ._3gka, .mCount, ._27vc, ._4pv-, ._6pk5,
 ._4qax, ._4756, ._w34, ._56bv::before, ._5769, ._34iv, ._z-w, ._t21, .mToken,
 #addMembersTypeahead .mToken.mTokenWeakReference,
@@ -124,14 +125,14 @@ button ._v89 ._54k8._1fl1 {
   border-left: 1px solid rgba(0, 0, 0, 0.3) !important;
 }
 
-._4_d1, ._5cni {
+._4_d1, ._5cni, ._3jcq {
   border-right: 1px solid rgba(0, 0, 0, 0.3) !important;
 }
 
 ._1mx0, ._1rbr, ._5yt8, ._idb, ._cld, ._1e8h, ._z-w, ._1ha, ._1n8h ._1oby, ._5f99, ._2t39,
-._2pbp, ._5rou:first-child, ._egf:first-child, ._io2, ._3qdi ._48_m::after,
+._2pbp, ._5rou:first-child, ._egf:first-child, ._io2, ._3qdi ._48_m::after, ._46dd::before,
 ._15n_, ._3-2-, ._27ve, ._2s20, ._gui, ._2s21 > *::after, ._32qk, ._d00, ._d01, ._38o9,
-._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils, ._5as0, ._5as2,
+._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils, ._5as0, ._5as2, ._5-lw,
 ._52x1, ._3wjp, ._usq, ._2cul:before, ._13e_, .jewel .flyout, ._3bg5 ._52x6, ._56d8, .al {
   border-top: 1px solid rgba(0, 0, 0, 0.3) !important;
 }
@@ -143,7 +144,7 @@ button ._v89 ._54k8._1fl1 {
 .mAppCenterFatLabel, .appCenterCategorySelectorButton, ._1q6v, ._5q_r, ._5yt8, ._38do, ._38dt,
 ._ap1, ._52x1, ._59tu, ._usq, ._13e_, ._59f6._55so::before, ._4gj3, .error, ._35--, ._1wev,
 .jx-result, ._1f9d, ._vef, ._55x2 > *, .al, ._44qk, ._5rgs, ._5xuj, ._1sv1, ._idb,
-._5lp5, ._3-2-, ._3to6, ._ir5, ._4nw6, ._4nwh, ._27ve, div._51v6::before,
+._5lp5, ._3-2-, ._3to6, ._ir5, ._4nw6, ._4nwh, ._27ve, div._51v6::before, ._5hu6,
 ._3c9h::before, ._2s20, ._gui, ._5jku, ._2foa, ._2y60, ._5fu3, ._4en9, ._1kb:not(:last-child) ._1kc,
 ._5pz4, ._5lp4, ._5lp5, ._5h6z, ._5h6x, ._2om4, ._5fjw > div, ._5fjv > :first-child,
 ._5fjw > :first-child {
@@ -163,7 +164,7 @@ button ._v89 ._54k8._1fl1 {
 ._1_y5, ._lr0, ._5hgt, ._2cpp, ._50uu, ._50uw, ._31yd, ._1e3d, ._3xz7, ._1xoz,
 ._4kcb, ._2lut, .jewel .touchable-notification.touched, .touchable-notification .touchable.touched,
 .home-notification .touchable.touched, ._6beo ._6ber,
-._73ku ._73jw,
+._73ku ._73jw, ._6--d, ._26vk._56bt,
 ._4e8n, ._uww, .mentions-placeholder, .mentions-shadow, .mentions-measurer,
 ._5whq, ._59tt, ._41ft::after, .jx-tokenizer, ._3uqf, ._4756, ._1rrd, ._5n_f {
   border: 1px solid rgba(0, 0, 0, 0.3) !important;
diff --git a/app/src/web/assets/js/header_hider.js b/app/src/web/assets/js/header_hider.js
deleted file mode 100644
index faa9f66d..00000000
--- a/app/src/web/assets/js/header_hider.js
+++ /dev/null
@@ -1,12 +0,0 @@
-"use strict";
-(function () {
-    var header = document.querySelector('#header');
-    if (!header) {
-        return;
-    }
-    var jewel = header.querySelector('#mJewelNav');
-    if (!jewel) {
-        return;
-    }
-    header.style.display = 'none';
-}).call(undefined);
diff --git a/app/src/web/assets/js/header_hider.ts b/app/src/web/assets/js/header_hider.ts
deleted file mode 100644
index 1a8f27f2..00000000
--- a/app/src/web/assets/js/header_hider.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-(function () {
-    const header = document.querySelector('#header');
-
-    if (!header) {
-        return
-    }
-
-    const jewel = header.querySelector('#mJewelNav');
-
-    if (!jewel) {
-        return
-    }
-
-    (<HTMLElement>header).style.display = 'none'
-}).call(undefined);
-
-
diff --git a/build.gradle b/build.gradle
index 22a0102b..33031d0b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
         classpath "com.bugsnag:bugsnag-android-gradle-plugin:${BUGSNAG_PLUGIN}"
         classpath "com.diffplug.spotless:spotless-plugin-gradle:${SPOTLESS}"
         classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:${DEX_PLUGIN}"
-        classpath "gradle.plugin.com.gladed.gradle.androidgitversion:gradle-android-git-version:${GIT_PLUGIN}"
+        classpath "com.gladed.androidgitversion:gradle-android-git-version:${GIT_PLUGIN}"
     }
 
     wrapper.setDistributionType(Wrapper.DistributionType.ALL)
diff --git a/docs/Changelog.md b/docs/Changelog.md
index 4d90b7fb..3d72ec4f 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -1,8 +1,24 @@
 # Changelog
 
+<<<<<<< HEAD
 ## v2.2.3
 * Add ability to hide stories
 * Remove fbclid from urls
+=======
+## v2.2.4
+* Show top bar to allow sharing posts
+* Fix unmuting videos when autoplay is enabled
+* Add shortcut to toggle autoplay in settings > behaviour
+* Update theme
+
+## v2.2.3
+* Add ability to hide stories
+* Remove fbclid from urls
+* Apply notification keyword filter to title as well
+* Remove round icon settings as they are the default in Facebook
+* Update theme
+* Update translations
+>>>>>>> dev
 
 ## v2.2.2
 * New marketplace shortcut
diff --git a/docs/Listing.md b/docs/Listing.md
index e82d09ce..e51c0026 100644
--- a/docs/Listing.md
+++ b/docs/Listing.md
@@ -1,37 +1,35 @@
-<b>Welcome to Frost for Facebook!</b>
+# Welcome to Frost for Facebook
 
 Frost is a fully functional web wrapper, with many unique and native features such as:
 
-• <b>True multi user interactions</b> - More than just an option in a settings menu, Frost's account switcher is right in the drawer. You are one tap away from switching accounts, and everything refreshes on the switch so that you can view other accounts instantaneously. Furthermore, the notification service will fetch notifications from all accounts, and will let you know which account has the new notification.
-• <b>Better multitasking</b> - Frost contains an overlaying web browser that can be drawn on top of your foreground task. Open links and notifications with a full screen view, then swipe away to get back to your previous task.
-• <b>Contextual awareness</b> - Frost integrates additional features via long presses. Need to copy a block of text or share a link? Long press the text. Need to zoom into an image or download it? Long press the image!
-• <b>Material Design</b> - Built for lollipop and up, Frost focuses strongly on a beautiful and functional UI, and embraces material transitions and dimensions.
-• <b>Complete theme engine</b> - Frost contains very comprehensive themes that customize all components of the app. Frost is also the only app to support transparent themes.
-• <b>Fully opened</b> - Nothing speaks for privacy more than being open sourced. Frost is proud to be one of those apps, and can be found on github (Link in the app's about section)
-• <b>Fixes the little things</b> - Frost is community driven, and many tweaks are added to address minor inconveniences and give a full native experience, despite being a web app. To list a few:
-&emsp;&emsp; • Focusing on a text input will prevent refreshing, so you don't accidentally swipe and lose your progress.
-&emsp;&emsp; • Horizontal swipe can be enabled along side the viewpager swipe with a simple long press
-&emsp;&emsp; • Automatic bug reports are sent when a crash is detected, so even if you don't contact the devs, you are helping contribute by using the app.
+- **True multi user interactions**: More than just an option in a settings menu, Frost's account switcher is right in the drawer. You are one tap away from switching accounts, and everything refreshes on the switch so that you can view other accounts instantaneously. Furthermore, the notification service will fetch notifications from all accounts, and will let you know which account has the new notification.
+- **Better multitasking**: Frost contains an overlaying web browser that can be drawn on top of your foreground task. Open links and notifications with a full screen view, then swipe away to get back to your previous task.
+- **Contextual awareness**: Frost integrates additional features via long presses. Need to copy a block of text or share a link? Long press the text. Need to zoom into an image or download it? Long press the image!
+- **Material Design**: Built for lollipop and up, Frost focuses strongly on a beautiful and functional UI, and embraces material transitions and dimensions.
+- **Complete theme engine**: Frost contains very comprehensive themes that customize all components of the app. Frost is also the only app to support transparent themes.
+- **Fully opened**: Nothing speaks for privacy more than being open sourced. Frost is proud to be one of those apps, and can be found on github (Link in the app's about section)
+- **Fixes the little things**: Frost is community driven, and many tweaks are added to address minor inconveniences and give a full native experience, despite being a web app. To list a few:
+  - Focusing on a text input will prevent refreshing, so you don't accidentally swipe and lose your progress.
+  - Horizontal swipe can be enabled along side the viewpager swipe with a simple long press
+  - Automatic bug reports are sent when a crash is detected, so even if you don't contact the devs, you are helping contribute by using the app.
 
-Mandatory permissions used and why:
+## Mandatory permissions used and why
 
-• Internet, Network State, Wifi State - Frost fetches the pages from Facebook's mobile website. It also needs the network state so as to limit internet usage when you are on a metered network.
-• Receive Boot Completed - Frost notifications persist on reboot, and need this permission to be added each time.
-• Vibrate - Needed to vibrate phone for notifications; this can be toggled in the settings
+- **Internet, Network State, Wifi State**: Frost fetches the pages from Facebook's mobile website. It also needs the network state so as to limit internet usage when you are on a metered network.
+- **Receive Boot Completed**: Frost notifications persist on reboot, and need this permission to be added each time.
+- **Vibrate**: Needed to vibrate phone for notifications; this can be toggled in the settings
 
-Optional permissions used and why:
-<i>(these are only requested when they have to be, and are disabled until then)</i>
+## Optional permissions used and why *(these are only requested when they have to be, and are disabled until then)*
 
-• Read/write external storage - Needed to upload photos in a new status and save photos when prompted
-• Fine/coarse location - Needed for the check in option if users wish to search for their location
+- **Read/write external storage**: Needed to upload photos in a new status and save photos when prompted
+- **Fine/coarse location**:  Needed for the check in option if users wish to search for their location
+- That's it! No privacy intrusion and no extra demands.
 
-• That's it! No privacy intrusion and no extra demands.
+## Permissions *NOT* used and why
 
-Permissions <i>NOT</i> used and why:
+- **Wakelock**: Frost takes advantage of Android's Job Scheduler, and lets the framework decide when to run background services. Frost therefore doesn't need to constantly run in the background, nor does it force your phone to stay awake.
+- **Retrieve running apps**: Frost has no need to access external apps or see what else is running
+- **Identity**: Frost manages its accounts internally and uses it solely to give you access to your account. We don't depend on other personal information and we don't even save your email.
+- **Camera**: While the camera permission can be added to allow you to directly take photos and upload them, we've decided that it would be best to allow you to do so externally and then share the photo with Frost
 
-• Wakelock - Frost takes advantage of Android's Job Scheduler, and lets the framework decide when to run background services. Frost therefore doesn't need to constantly run in the background, nor does it force your phone to stay awake.
-• Retrieve running apps - Frost has no need to access external apps or see what else is running
-• Identity - Frost manages its accounts internally and uses it solely to give you access to your account. We don't depend on other personal information and we don't even save your email.
-• Camera - While the camera permission can be added to allow you to directly take photos and upload them, we've decided that it would be best to allow you to do so externally and then share the photo with Frost
-
-* Frost is a third party app and is in no way affiliated with Facebook Inc.*
+*Frost is a third party app and is in no way affiliated with Facebook Inc.*
diff --git a/gradle.properties b/gradle.properties
index 146591bb..c080daa0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,23 +14,27 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro
 APP_ID=Frost
 APP_GROUP=com.pitchedapps
 
+<<<<<<< HEAD
 KAU=4.0.0-alpha02
+=======
+KAU=4.0.0
+>>>>>>> dev
 KOTLIN=1.3.21
 
 # https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
 ANDROID_GRADLE=3.3.2
 
 # https://github.com/diffplug/spotless/blob/master/plugin-gradle/CHANGES.md
-SPOTLESS=3.17.0
+SPOTLESS=3.21.1
 
 # https://github.com/bugsnag/bugsnag-android/releases
-BUGSNAG=4.9.3
+BUGSNAG=4.12.0
 # https://github.com/bugsnag/bugsnag-android-gradle-plugin/releases
-BUGSNAG_PLUGIN=3.6.0
+BUGSNAG_PLUGIN=4.1.1
 # https://github.com/KeepSafe/dexcount-gradle-plugin/releases
 DEX_PLUGIN=0.8.5
 # https://github.com/gladed/gradle-android-git-version/releases
-GIT_PLUGIN=0.4.7
+GIT_PLUGIN=0.4.9
 # https://mvnrepository.com/artifact/org.apache.commons/commons-text
 # Updates blocked due to javax.script dependency
 COMMONS_TEXT=1.4
@@ -41,7 +45,7 @@ EXOMEDIA=4.3.0
 # https://github.com/InsertKoinIO/koin/blob/master/CHANGELOG.md
 KOIN=1.0.2
 # https://github.com/mockk/mockk/releases
-MOCKK=1.8.13.kotlin13
+MOCKK=1.9.3
 # https://mvnrepository.com/artifact/androidx.core/core-ktx?repo=google
 KTX=1.0.1
 
@@ -54,11 +58,15 @@ LEAK_CANARY=1.6.2
 # https://github.com/zsmb13/MaterialDrawerKt/releases
 MATERIAL_DRAWER_KT=2.0.1
 # https://github.com/square/okhttp/releases
-OKHTTP=3.12.1
+OKHTTP=3.14.0
 # http://robolectric.org/getting-started/
+<<<<<<< HEAD
 ROBOELECTRIC=4.1
 # https://developer.android.com/jetpack/androidx/releases/room
 ROOM=2.1.0-alpha04
+=======
+ROBOELECTRIC=4.2
+>>>>>>> dev
 # https://github.com/davemorrissey/subsampling-scale-image-view#quick-start
 SCALE_IMAGE_VIEW=3.10.0
 # https://github.com/umano/AndroidSlidingUpPanel#importing-the-library
author	Allan Wang <me@allanwang.ca>	2019-04-21 20:22:11 -0400
committer	Allan Wang <me@allanwang.ca>	2019-04-21 20:22:11 -0400
commit	bbafb7b65ce655c1fdda8badd3098d2a0e1f7f08 (patch)
tree	354b0bb6f021af54d1e3586e3e9bda064ad4ef02
parent	e5eb928feacba8d1c634ad8e5d85259ae161cabd (diff)
parent	f0f95295bdb2b853aa6262ec4bed2353ce326eee (diff)
download	frost-bbafb7b65ce655c1fdda8badd3098d2a0e1f7f08.tar.gz frost-bbafb7b65ce655c1fdda8badd3098d2a0e1f7f08.tar.bz2 frost-bbafb7b65ce655c1fdda8badd3098d2a0e1f7f08.zip