Theme (#1308)

* Add new attribute and theme messages page

* Theme more components

* Update comments and remove them from css files

* Support at field in theme builder

* Support at field in theme builder

* Use wildcard matcher for menu overflow

19 files changed, 187 insertions, 90 deletions

diff --git a/app/src/main/assets/css/core/_colors.scss b/app/src/main/assets/css/core/_colors.scss
index c6e90146..1411a857 100644
--- a/app/src/main/assets/css/core/_colors.scss
+++ b/app/src/main/assets/css/core/_colors.scss
@@ -4,6 +4,8 @@ $bg_transparent: rgba(#f0f, 0.02) !default;
 //Our default colors are test colors; production files should always import the actual colors
 
 $text: #d7b0d7 !default;
+// must be visible with accent as the background
+$accent_text: #76d7c2 !default;
 $link: #9266d5 !default;
 $accent: #3b5998 !default;
 $background: #451515 !default;
diff --git a/app/src/main/assets/css/core/_core_border.scss b/app/src/main/assets/css/core/_core_border.scss
index 27c06d82..c366bc14 100644
--- a/app/src/main/assets/css/core/_core_border.scss
+++ b/app/src/main/assets/css/core/_core_border.scss
@@ -4,7 +4,7 @@
   border-left: 1px solid $divider !important;
 }
 
-._4_d1 {
+._4_d1, ._5cni {
   border-right: 1px solid $divider !important;
 }
 
@@ -12,7 +12,7 @@
 ._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,
 ._15n_, ._3-2-, ._27ve, ._2s20, ._gui, ._2s21 > *::after, ._32qk, ._d00, ._d01, ._38o9,
-._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils,
+._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils, ._5as0, ._5as2,
 ._52x1, ._3wjp, ._usq, ._2cul:before, ._13e_, .jewel .flyout, ._3bg5 ._52x6, ._56d8, .al {
   border-top: 1px solid $divider !important;
 }
diff --git a/app/src/main/assets/css/core/_core_messenger.scss b/app/src/main/assets/css/core/_core_messenger.scss
new file mode 100644
index 00000000..608fc23d
--- /dev/null
+++ b/app/src/main/assets/css/core/_core_messenger.scss
@@ -0,0 +1,20 @@
+// Not all messenger related components are here; only the main ones.
+// Borders for instance are merged into core_border
+
+// Other person's message bubble
+._34ee {
+  background: $background2 !important;
+  color: $text !important;
+
+}
+
+// Your message bubble; order matters
+._34em ._34ee {
+  background: $accent !important;
+  color: $accent_text !important;
+}
+
+// Sticker page
+._5as0, ._5cni, ._5as2 {
+  background: $bg_opaque !important;
+}
\ No newline at end of file
diff --git a/app/src/main/assets/css/core/_core_text.scss b/app/src/main/assets/css/core/_core_text.scss
index 20d65224..154cee84 100644
--- a/app/src/main/assets/css/core/_core_text.scss
+++ b/app/src/main/assets/css/core/_core_text.scss
@@ -4,7 +4,7 @@
 ._z-z, ._z-v, ._1e8d, ._36nl, ._36nm, ._2_11, ._2_rf, ._2ip_, ._403p, .cq, ._usr,
 ._5xu2, ._3ml8, ._3mla, ._50vk, ._1m2u, ._31y7, ._4kcb, ._1lf6, ._1lf5,
 ._1lf4, ._1hiz, ._xod, ._5ag5, ._zmk, ._3t_h, ._5lm6, ._3clv, ._3zlc, ._36rd,
-._31zk, ._31zl, ._3xsa, ._3xs9, ._2-4s, ._2fzz ul,
+._31zk, ._31zl, ._3xsa, ._3xs9, ._2-4s, ._2fzz ul, ._3z10,
 ._43mh, .touch .btn, .fcg, button, ._52j9, ._52jb, ._52ja, ._5j35,
 ._rnk, ._24u0, ._1g06, ._14ye, .fcb, ._56cz._56c_, ._1gk_, ._55fj, ._45fu,
 ._18qg, ._1_ac, ._529p, ._4dwt ._1vh3, ._4a5f, ._23_t, ._2rzc, ._23_s, ._2rzd,
diff --git a/app/src/main/assets/css/core/_svg.scss b/app/src/main/assets/css/core/_svg.scss
index 7ed3beb2..8c714438 100644
--- a/app/src/main/assets/css/core/_svg.scss
+++ b/app/src/main/assets/css/core/_svg.scss
@@ -17,12 +17,10 @@ $video: '<svg xmlns="http://www.w3.org/2000/svg" fill="#{$text}" viewBox="0 0 50
 $like: '<svg xmlns="http://www.w3.org/2000/svg" fill="#{$text}" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M1 21h4V9H1v12zm22-11c0-1.1-.9-2-2-2h-6.31l.95-4.57.03-.32c0-.41-.17-.79-.44-1.06L14.17 1 7.59 7.59C7.22 7.95 7 8.45 7 9v10c0 1.1.9 2 2 2h9c.83 0 1.54-.5 1.84-1.22l3.02-7.05c.09-.23.14-.47.14-.73v-1.91l-.01-.01L23 10z"/></svg>';
 $like_selected: '<svg xmlns="http://www.w3.org/2000/svg" fill="#{$accent}" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M1 21h4V9H1v12zm22-11c0-1.1-.9-2-2-2h-6.31l.95-4.57.03-.32c0-.41-.17-.79-.44-1.06L14.17 1 7.59 7.59C7.22 7.95 7 8.45 7 9v10c0 1.1.9 2 2 2h9c.83 0 1.54-.5 1.84-1.22l3.02-7.05c.09-.23.14-.47.14-.73v-1.91l-.01-.01L23 10z"/></svg>';
 
-/*
- * 2018/12/29
- * Previously ._15km ._15ko::before and ._15km ._15ko._77la::before; however, reaction changes no longer affect this element
- * The robust measure seems to be the parent of a[data-sigil~="like-reaction-flyout"] along with [data-sigil~="like"] for an unliked post
- * and [data-sigil~="unlike"] for a liked post
- */
+// 2018/12/29
+// Previously ._15km ._15ko::before and ._15km ._15ko._77la::before; however, reaction changes no longer affect this element
+// The robust measure seems to be the parent of a[data-sigil~="like-reaction-flyout"] along with [data-sigil~="like"] for an unliked post
+// and [data-sigil~="unlike"] for a liked post
 ._15km ._15ko::before {
   @include background-svg($like);
   background-position: center !important;
@@ -49,21 +47,28 @@ $share: '<svg xmlns="http://www.w3.org/2000/svg" fill="#{$text}" viewBox="0 0 24
 
 $more_horiz: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path fill="#{$text}" d="M6 10c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm12 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm-6 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"/></svg>';
 
-$menus: ".sp_89zNula0Qh5",
-".sp_MP2OtCXORz9",
-".sp_NIWBacTn8LF",
-// 2018/12/31
-".sp_9ZFVhnFyWsw";
-
-$menu_collector: ();
-
-@each $menu in $menus {
-  $menu_collector: append($menu_collector, unquote('#{$menu}'), 'comma');
-  $menu_collector: append($menu_collector, unquote('#{$menu}_2x'), 'comma');
-  $menu_collector: append($menu_collector, unquote('#{$menu}_3x'), 'comma');
-}
-
-#{$menu_collector} {
+//$menus: ".sp_89zNula0Qh5",
+//".sp_MP2OtCXORz9",
+//".sp_NIWBacTn8LF",
+//// 2018/12/31
+//".sp_9ZFVhnFyWsw",
+//// 2019/01/03
+//".sp_SJIJjSlGEIO";
+//
+//$menu_collector: ();
+//
+//@each $menu in $menus {
+//  $menu_collector: append($menu_collector, unquote('#{$menu}'), 'comma');
+//  $menu_collector: append($menu_collector, unquote('#{$menu}_2x'), 'comma');
+//  $menu_collector: append($menu_collector, unquote('#{$menu}_3x'), 'comma');
+//}
+//
+//#{$menu_collector} {
+//  @include background-svg($more_horiz);
+//  background-position: center !important;
+//}
+
+.story_body_container i.img[data-sigil*="story-popup-context"] {
   @include background-svg($more_horiz);
   background-position: center !important;
 }
\ No newline at end of file
diff --git a/app/src/main/assets/css/core/core.css b/app/src/main/assets/css/core/core.css
index 45b05359..1d48fa35 100644
--- a/app/src/main/assets/css/core/core.css
+++ b/app/src/main/assets/css/core/core.css
@@ -4,7 +4,7 @@
 ._z-z, ._z-v, ._1e8d, ._36nl, ._36nm, ._2_11, ._2_rf, ._2ip_, ._403p, .cq, ._usr,
 ._5xu2, ._3ml8, ._3mla, ._50vk, ._1m2u, ._31y7, ._4kcb, ._1lf6, ._1lf5,
 ._1lf4, ._1hiz, ._xod, ._5ag5, ._zmk, ._3t_h, ._5lm6, ._3clv, ._3zlc, ._36rd,
-._31zk, ._31zl, ._3xsa, ._3xs9, ._2-4s, ._2fzz ul,
+._31zk, ._31zl, ._3xsa, ._3xs9, ._2-4s, ._2fzz ul, ._3z10,
 ._43mh, .touch .btn, .fcg, button, ._52j9, ._52jb, ._52ja, ._5j35,
 ._rnk, ._24u0, ._1g06, ._14ye, .fcb, ._56cz._56c_, ._1gk_, ._55fj, ._45fu,
 ._18qg, ._1_ac, ._529p, ._4dwt ._1vh3, ._4a5f, ._23_t, ._2rzc, ._23_s, ._2rzd,
@@ -124,14 +124,14 @@ button ._v89 ._54k8._1fl1 {
   border-left: 1px solid rgba(215, 176, 215, 0.3) !important;
 }
 
-._4_d1 {
+._4_d1, ._5cni {
   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,
 ._15n_, ._3-2-, ._27ve, ._2s20, ._gui, ._2s21 > *::after, ._32qk, ._d00, ._d01, ._38o9,
-._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils,
+._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils, ._5as0, ._5as2,
 ._52x1, ._3wjp, ._usq, ._2cul:before, ._13e_, .jewel .flyout, ._3bg5 ._52x6, ._56d8, .al {
   border-top: 1px solid rgba(215, 176, 215, 0.3) !important;
 }
@@ -208,6 +208,20 @@ button ._v89 ._54k8._1fl1 {
   border-bottom: 1px solid #d7b0d7 !important;
 }
 
+._34ee {
+  background: rgba(199, 70, 70, 0.35) !important;
+  color: #d7b0d7 !important;
+}
+
+._34em ._34ee {
+  background: #3b5998 !important;
+  color: #76d7c2 !important;
+}
+
+._5as0, ._5cni, ._5as2 {
+  background: #451515 !important;
+}
+
 *, *::after, *::before {
   text-shadow: none !important;
   box-shadow: none !important;
diff --git a/app/src/main/assets/css/core/core.scss b/app/src/main/assets/css/core/core.scss
index 8091e2a6..38086529 100644
--- a/app/src/main/assets/css/core/core.scss
+++ b/app/src/main/assets/css/core/core.scss
@@ -3,6 +3,7 @@
 @import "core_text";
 @import "core_bg";
 @import "core_border";
+@import "core_messenger";
 
 //GLOBAL overrides; use with caution
 *, *::after, *::before {
diff --git a/app/src/main/assets/css/themes/custom.css b/app/src/main/assets/css/themes/custom.css
index ee518218..e38c6de0 100644
--- a/app/src/main/assets/css/themes/custom.css
+++ b/app/src/main/assets/css/themes/custom.css
@@ -4,7 +4,7 @@
 ._z-z, ._z-v, ._1e8d, ._36nl, ._36nm, ._2_11, ._2_rf, ._2ip_, ._403p, .cq, ._usr,
 ._5xu2, ._3ml8, ._3mla, ._50vk, ._1m2u, ._31y7, ._4kcb, ._1lf6, ._1lf5,
 ._1lf4, ._1hiz, ._xod, ._5ag5, ._zmk, ._3t_h, ._5lm6, ._3clv, ._3zlc, ._36rd,
-._31zk, ._31zl, ._3xsa, ._3xs9, ._2-4s, ._2fzz ul,
+._31zk, ._31zl, ._3xsa, ._3xs9, ._2-4s, ._2fzz ul, ._3z10,
 ._43mh, .touch .btn, .fcg, button, ._52j9, ._52jb, ._52ja, ._5j35,
 ._rnk, ._24u0, ._1g06, ._14ye, .fcb, ._56cz._56c_, ._1gk_, ._55fj, ._45fu,
 ._18qg, ._1_ac, ._529p, ._4dwt ._1vh3, ._4a5f, ._23_t, ._2rzc, ._23_s, ._2rzd,
@@ -124,14 +124,14 @@ button ._v89 ._54k8._1fl1 {
   border-left: 1px solid $D$ !important;
 }
 
-._4_d1 {
+._4_d1, ._5cni {
   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,
 ._15n_, ._3-2-, ._27ve, ._2s20, ._gui, ._2s21 > *::after, ._32qk, ._d00, ._d01, ._38o9,
-._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils,
+._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils, ._5as0, ._5as2,
 ._52x1, ._3wjp, ._usq, ._2cul:before, ._13e_, .jewel .flyout, ._3bg5 ._52x6, ._56d8, .al {
   border-top: 1px solid $D$ !important;
 }
@@ -208,6 +208,20 @@ button ._v89 ._54k8._1fl1 {
   border-bottom: 1px solid $T$ !important;
 }
 
+._34ee {
+  background: $BBT$ !important;
+  color: $T$ !important;
+}
+
+._34em ._34ee {
+  background: $A$ !important;
+  color: $AT$ !important;
+}
+
+._5as0, ._5cni, ._5as2 {
+  background: $O$ !important;
+}
+
 *, *::after, *::before {
   text-shadow: none !important;
   box-shadow: none !important;
@@ -298,12 +312,6 @@ button ._v89 ._54k8._1fl1 {
   background: url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" fill="$T$" viewBox="0 0 50 50"%3E%3Cpath fill="none" d="M13 26h24v24H13z"/%3E%3Cpath d="M30 31.5V28c0-.55-.45-1-1-1H17c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h12c.55 0 1-.45 1-1v-3.5l4 4v-11l-4 4z"/%3E%3C/svg%3E') no-repeat !important;
 }
 
-/*
- * 2018/12/29
- * Previously ._15km ._15ko::before and ._15km ._15ko._77la::before; however, reaction changes no longer affect this element
- * The robust measure seems to be the parent of a[data-sigil~="like-reaction-flyout"] along with [data-sigil~="like"] for an unliked post
- * and [data-sigil~="unlike"] for a liked post
- */
 ._15km ._15ko::before {
   background: url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" fill="$T$" viewBox="0 0 24 24"%3E%3Cpath fill="none" d="M0 0h24v24H0z"/%3E%3Cpath d="M1 21h4V9H1v12zm22-11c0-1.1-.9-2-2-2h-6.31l.95-4.57.03-.32c0-.41-.17-.79-.44-1.06L14.17 1 7.59 7.59C7.22 7.95 7 8.45 7 9v10c0 1.1.9 2 2 2h9c.83 0 1.54-.5 1.84-1.22l3.02-7.05c.09-.23.14-.47.14-.73v-1.91l-.01-.01L23 10z"/%3E%3C/svg%3E') no-repeat !important;
   background-position: center !important;
@@ -324,7 +332,7 @@ button ._v89 ._54k8._1fl1 {
   background-position: center !important;
 }
 
-.sp_89zNula0Qh5, .sp_89zNula0Qh5_2x, .sp_89zNula0Qh5_3x, .sp_MP2OtCXORz9, .sp_MP2OtCXORz9_2x, .sp_MP2OtCXORz9_3x, .sp_NIWBacTn8LF, .sp_NIWBacTn8LF_2x, .sp_NIWBacTn8LF_3x, .sp_9ZFVhnFyWsw, .sp_9ZFVhnFyWsw_2x, .sp_9ZFVhnFyWsw_3x {
+.story_body_container i.img[data-sigil*=story-popup-context] {
   background: url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"%3E%3Cpath fill="none" d="M0 0h24v24H0z"/%3E%3Cpath fill="$T$" d="M6 10c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm12 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm-6 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"/%3E%3C/svg%3E') no-repeat !important;
   background-position: center !important;
 }
diff --git a/app/src/main/assets/css/themes/custom.scss b/app/src/main/assets/css/themes/custom.scss
index c0a9ab49..50c029fb 100644
--- a/app/src/main/assets/css/themes/custom.scss
+++ b/app/src/main/assets/css/themes/custom.scss
@@ -2,6 +2,7 @@ $bg_transparent: unquote('$BT$');
 $text: unquote('$T$');
 $link: unquote('$TT$');
 $accent: unquote('$A$');
+$accent_text: unquote('$AT$');
 $background: unquote('$B$');
 $background2: unquote('$BBT$');
 $bg_opaque: unquote('$O$');
diff --git a/app/src/main/assets/css/themes/material_amoled.css b/app/src/main/assets/css/themes/material_amoled.css
index a33f5b77..c821003e 100644
--- a/app/src/main/assets/css/themes/material_amoled.css
+++ b/app/src/main/assets/css/themes/material_amoled.css
@@ -4,7 +4,7 @@
 ._z-z, ._z-v, ._1e8d, ._36nl, ._36nm, ._2_11, ._2_rf, ._2ip_, ._403p, .cq, ._usr,
 ._5xu2, ._3ml8, ._3mla, ._50vk, ._1m2u, ._31y7, ._4kcb, ._1lf6, ._1lf5,
 ._1lf4, ._1hiz, ._xod, ._5ag5, ._zmk, ._3t_h, ._5lm6, ._3clv, ._3zlc, ._36rd,
-._31zk, ._31zl, ._3xsa, ._3xs9, ._2-4s, ._2fzz ul,
+._31zk, ._31zl, ._3xsa, ._3xs9, ._2-4s, ._2fzz ul, ._3z10,
 ._43mh, .touch .btn, .fcg, button, ._52j9, ._52jb, ._52ja, ._5j35,
 ._rnk, ._24u0, ._1g06, ._14ye, .fcb, ._56cz._56c_, ._1gk_, ._55fj, ._45fu,
 ._18qg, ._1_ac, ._529p, ._4dwt ._1vh3, ._4a5f, ._23_t, ._2rzc, ._23_s, ._2rzd,
@@ -124,14 +124,14 @@ button ._v89 ._54k8._1fl1 {
   border-left: 1px solid rgba(255, 255, 255, 0.3) !important;
 }
 
-._4_d1 {
+._4_d1, ._5cni {
   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,
 ._15n_, ._3-2-, ._27ve, ._2s20, ._gui, ._2s21 > *::after, ._32qk, ._d00, ._d01, ._38o9,
-._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils,
+._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils, ._5as0, ._5as2,
 ._52x1, ._3wjp, ._usq, ._2cul:before, ._13e_, .jewel .flyout, ._3bg5 ._52x6, ._56d8, .al {
   border-top: 1px solid rgba(255, 255, 255, 0.3) !important;
 }
@@ -208,6 +208,20 @@ button ._v89 ._54k8._1fl1 {
   border-bottom: 1px solid #fff !important;
 }
 
+._34ee {
+  background: rgba(0, 0, 0, 0.35) !important;
+  color: #fff !important;
+}
+
+._34em ._34ee {
+  background: #5d86dd !important;
+  color: #fff !important;
+}
+
+._5as0, ._5cni, ._5as2 {
+  background: black !important;
+}
+
 *, *::after, *::before {
   text-shadow: none !important;
   box-shadow: none !important;
@@ -298,12 +312,6 @@ button ._v89 ._54k8._1fl1 {
   background: url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" fill="%23fff" viewBox="0 0 50 50"%3E%3Cpath fill="none" d="M13 26h24v24H13z"/%3E%3Cpath d="M30 31.5V28c0-.55-.45-1-1-1H17c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h12c.55 0 1-.45 1-1v-3.5l4 4v-11l-4 4z"/%3E%3C/svg%3E') no-repeat !important;
 }
 
-/*
- * 2018/12/29
- * Previously ._15km ._15ko::before and ._15km ._15ko._77la::before; however, reaction changes no longer affect this element
- * The robust measure seems to be the parent of a[data-sigil~="like-reaction-flyout"] along with [data-sigil~="like"] for an unliked post
- * and [data-sigil~="unlike"] for a liked post
- */
 ._15km ._15ko::before {
   background: url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" fill="%23fff" viewBox="0 0 24 24"%3E%3Cpath fill="none" d="M0 0h24v24H0z"/%3E%3Cpath d="M1 21h4V9H1v12zm22-11c0-1.1-.9-2-2-2h-6.31l.95-4.57.03-.32c0-.41-.17-.79-.44-1.06L14.17 1 7.59 7.59C7.22 7.95 7 8.45 7 9v10c0 1.1.9 2 2 2h9c.83 0 1.54-.5 1.84-1.22l3.02-7.05c.09-.23.14-.47.14-.73v-1.91l-.01-.01L23 10z"/%3E%3C/svg%3E') no-repeat !important;
   background-position: center !important;
@@ -324,7 +332,7 @@ button ._v89 ._54k8._1fl1 {
   background-position: center !important;
 }
 
-.sp_89zNula0Qh5, .sp_89zNula0Qh5_2x, .sp_89zNula0Qh5_3x, .sp_MP2OtCXORz9, .sp_MP2OtCXORz9_2x, .sp_MP2OtCXORz9_3x, .sp_NIWBacTn8LF, .sp_NIWBacTn8LF_2x, .sp_NIWBacTn8LF_3x, .sp_9ZFVhnFyWsw, .sp_9ZFVhnFyWsw_2x, .sp_9ZFVhnFyWsw_3x {
+.story_body_container i.img[data-sigil*=story-popup-context] {
   background: url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"%3E%3Cpath fill="none" d="M0 0h24v24H0z"/%3E%3Cpath fill="%23fff" d="M6 10c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm12 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm-6 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"/%3E%3C/svg%3E') no-repeat !important;
   background-position: center !important;
 }
diff --git a/app/src/main/assets/css/themes/material_amoled.scss b/app/src/main/assets/css/themes/material_amoled.scss
index 442d6194..19190126 100644
--- a/app/src/main/assets/css/themes/material_amoled.scss
+++ b/app/src/main/assets/css/themes/material_amoled.scss
@@ -1,4 +1,5 @@
 $text: #fff;
+$accent_text: #fff;
 $link: #5d86dd;
 $accent: #5d86dd;
 $background: #000;
diff --git a/app/src/main/assets/css/themes/material_dark.css b/app/src/main/assets/css/themes/material_dark.css
index 1f650f41..0dc739eb 100644
--- a/app/src/main/assets/css/themes/material_dark.css
+++ b/app/src/main/assets/css/themes/material_dark.css
@@ -4,7 +4,7 @@
 ._z-z, ._z-v, ._1e8d, ._36nl, ._36nm, ._2_11, ._2_rf, ._2ip_, ._403p, .cq, ._usr,
 ._5xu2, ._3ml8, ._3mla, ._50vk, ._1m2u, ._31y7, ._4kcb, ._1lf6, ._1lf5,
 ._1lf4, ._1hiz, ._xod, ._5ag5, ._zmk, ._3t_h, ._5lm6, ._3clv, ._3zlc, ._36rd,
-._31zk, ._31zl, ._3xsa, ._3xs9, ._2-4s, ._2fzz ul,
+._31zk, ._31zl, ._3xsa, ._3xs9, ._2-4s, ._2fzz ul, ._3z10,
 ._43mh, .touch .btn, .fcg, button, ._52j9, ._52jb, ._52ja, ._5j35,
 ._rnk, ._24u0, ._1g06, ._14ye, .fcb, ._56cz._56c_, ._1gk_, ._55fj, ._45fu,
 ._18qg, ._1_ac, ._529p, ._4dwt ._1vh3, ._4a5f, ._23_t, ._2rzc, ._23_s, ._2rzd,
@@ -124,14 +124,14 @@ button ._v89 ._54k8._1fl1 {
   border-left: 1px solid rgba(255, 255, 255, 0.3) !important;
 }
 
-._4_d1 {
+._4_d1, ._5cni {
   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,
 ._15n_, ._3-2-, ._27ve, ._2s20, ._gui, ._2s21 > *::after, ._32qk, ._d00, ._d01, ._38o9,
-._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils,
+._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils, ._5as0, ._5as2,
 ._52x1, ._3wjp, ._usq, ._2cul:before, ._13e_, .jewel .flyout, ._3bg5 ._52x6, ._56d8, .al {
   border-top: 1px solid rgba(255, 255, 255, 0.3) !important;
 }
@@ -208,6 +208,20 @@ button ._v89 ._54k8._1fl1 {
   border-bottom: 1px solid #fff !important;
 }
 
+._34ee {
+  background: rgba(137, 137, 137, 0.35) !important;
+  color: #fff !important;
+}
+
+._34em ._34ee {
+  background: #5d86dd !important;
+  color: #fff !important;
+}
+
+._5as0, ._5cni, ._5as2 {
+  background: #303030 !important;
+}
+
 *, *::after, *::before {
   text-shadow: none !important;
   box-shadow: none !important;
@@ -298,12 +312,6 @@ button ._v89 ._54k8._1fl1 {
   background: url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" fill="%23fff" viewBox="0 0 50 50"%3E%3Cpath fill="none" d="M13 26h24v24H13z"/%3E%3Cpath d="M30 31.5V28c0-.55-.45-1-1-1H17c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h12c.55 0 1-.45 1-1v-3.5l4 4v-11l-4 4z"/%3E%3C/svg%3E') no-repeat !important;
 }
 
-/*
- * 2018/12/29
- * Previously ._15km ._15ko::before and ._15km ._15ko._77la::before; however, reaction changes no longer affect this element
- * The robust measure seems to be the parent of a[data-sigil~="like-reaction-flyout"] along with [data-sigil~="like"] for an unliked post
- * and [data-sigil~="unlike"] for a liked post
- */
 ._15km ._15ko::before {
   background: url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" fill="%23fff" viewBox="0 0 24 24"%3E%3Cpath fill="none" d="M0 0h24v24H0z"/%3E%3Cpath d="M1 21h4V9H1v12zm22-11c0-1.1-.9-2-2-2h-6.31l.95-4.57.03-.32c0-.41-.17-.79-.44-1.06L14.17 1 7.59 7.59C7.22 7.95 7 8.45 7 9v10c0 1.1.9 2 2 2h9c.83 0 1.54-.5 1.84-1.22l3.02-7.05c.09-.23.14-.47.14-.73v-1.91l-.01-.01L23 10z"/%3E%3C/svg%3E') no-repeat !important;
   background-position: center !important;
@@ -324,7 +332,7 @@ button ._v89 ._54k8._1fl1 {
   background-position: center !important;
 }
 
-.sp_89zNula0Qh5, .sp_89zNula0Qh5_2x, .sp_89zNula0Qh5_3x, .sp_MP2OtCXORz9, .sp_MP2OtCXORz9_2x, .sp_MP2OtCXORz9_3x, .sp_NIWBacTn8LF, .sp_NIWBacTn8LF_2x, .sp_NIWBacTn8LF_3x, .sp_9ZFVhnFyWsw, .sp_9ZFVhnFyWsw_2x, .sp_9ZFVhnFyWsw_3x {
+.story_body_container i.img[data-sigil*=story-popup-context] {
   background: url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"%3E%3Cpath fill="none" d="M0 0h24v24H0z"/%3E%3Cpath fill="%23fff" d="M6 10c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm12 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm-6 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"/%3E%3C/svg%3E') no-repeat !important;
   background-position: center !important;
 }
diff --git a/app/src/main/assets/css/themes/material_dark.scss b/app/src/main/assets/css/themes/material_dark.scss
index 47f04c42..18b8b461 100644
--- a/app/src/main/assets/css/themes/material_dark.scss
+++ b/app/src/main/assets/css/themes/material_dark.scss
@@ -1,4 +1,5 @@
 $text: #fff;
+$accent_text: #fff;
 $link: #5d86dd;
 $accent: #5d86dd;
 $background: #303030;
diff --git a/app/src/main/assets/css/themes/material_glass.css b/app/src/main/assets/css/themes/material_glass.css
index be6729ca..3bf9530f 100644
--- a/app/src/main/assets/css/themes/material_glass.css
+++ b/app/src/main/assets/css/themes/material_glass.css
@@ -4,7 +4,7 @@
 ._z-z, ._z-v, ._1e8d, ._36nl, ._36nm, ._2_11, ._2_rf, ._2ip_, ._403p, .cq, ._usr,
 ._5xu2, ._3ml8, ._3mla, ._50vk, ._1m2u, ._31y7, ._4kcb, ._1lf6, ._1lf5,
 ._1lf4, ._1hiz, ._xod, ._5ag5, ._zmk, ._3t_h, ._5lm6, ._3clv, ._3zlc, ._36rd,
-._31zk, ._31zl, ._3xsa, ._3xs9, ._2-4s, ._2fzz ul,
+._31zk, ._31zl, ._3xsa, ._3xs9, ._2-4s, ._2fzz ul, ._3z10,
 ._43mh, .touch .btn, .fcg, button, ._52j9, ._52jb, ._52ja, ._5j35,
 ._rnk, ._24u0, ._1g06, ._14ye, .fcb, ._56cz._56c_, ._1gk_, ._55fj, ._45fu,
 ._18qg, ._1_ac, ._529p, ._4dwt ._1vh3, ._4a5f, ._23_t, ._2rzc, ._23_s, ._2rzd,
@@ -124,14 +124,14 @@ button ._v89 ._54k8._1fl1 {
   border-left: 1px solid rgba(255, 255, 255, 0.3) !important;
 }
 
-._4_d1 {
+._4_d1, ._5cni {
   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,
 ._15n_, ._3-2-, ._27ve, ._2s20, ._gui, ._2s21 > *::after, ._32qk, ._d00, ._d01, ._38o9,
-._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils,
+._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils, ._5as0, ._5as2,
 ._52x1, ._3wjp, ._usq, ._2cul:before, ._13e_, .jewel .flyout, ._3bg5 ._52x6, ._56d8, .al {
   border-top: 1px solid rgba(255, 255, 255, 0.3) !important;
 }
@@ -208,6 +208,20 @@ button ._v89 ._54k8._1fl1 {
   border-bottom: 1px solid #fff !important;
 }
 
+._34ee {
+  background: rgba(89, 89, 89, 0.35) !important;
+  color: #fff !important;
+}
+
+._34em ._34ee {
+  background: #5d86dd !important;
+  color: #fff !important;
+}
+
+._5as0, ._5cni, ._5as2 {
+  background: black !important;
+}
+
 *, *::after, *::before {
   text-shadow: none !important;
   box-shadow: none !important;
@@ -298,12 +312,6 @@ button ._v89 ._54k8._1fl1 {
   background: url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" fill="%23fff" viewBox="0 0 50 50"%3E%3Cpath fill="none" d="M13 26h24v24H13z"/%3E%3Cpath d="M30 31.5V28c0-.55-.45-1-1-1H17c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h12c.55 0 1-.45 1-1v-3.5l4 4v-11l-4 4z"/%3E%3C/svg%3E') no-repeat !important;
 }
 
-/*
- * 2018/12/29
- * Previously ._15km ._15ko::before and ._15km ._15ko._77la::before; however, reaction changes no longer affect this element
- * The robust measure seems to be the parent of a[data-sigil~="like-reaction-flyout"] along with [data-sigil~="like"] for an unliked post
- * and [data-sigil~="unlike"] for a liked post
- */
 ._15km ._15ko::before {
   background: url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" fill="%23fff" viewBox="0 0 24 24"%3E%3Cpath fill="none" d="M0 0h24v24H0z"/%3E%3Cpath d="M1 21h4V9H1v12zm22-11c0-1.1-.9-2-2-2h-6.31l.95-4.57.03-.32c0-.41-.17-.79-.44-1.06L14.17 1 7.59 7.59C7.22 7.95 7 8.45 7 9v10c0 1.1.9 2 2 2h9c.83 0 1.54-.5 1.84-1.22l3.02-7.05c.09-.23.14-.47.14-.73v-1.91l-.01-.01L23 10z"/%3E%3C/svg%3E') no-repeat !important;
   background-position: center !important;
@@ -324,7 +332,7 @@ button ._v89 ._54k8._1fl1 {
   background-position: center !important;
 }
 
-.sp_89zNula0Qh5, .sp_89zNula0Qh5_2x, .sp_89zNula0Qh5_3x, .sp_MP2OtCXORz9, .sp_MP2OtCXORz9_2x, .sp_MP2OtCXORz9_3x, .sp_NIWBacTn8LF, .sp_NIWBacTn8LF_2x, .sp_NIWBacTn8LF_3x, .sp_9ZFVhnFyWsw, .sp_9ZFVhnFyWsw_2x, .sp_9ZFVhnFyWsw_3x {
+.story_body_container i.img[data-sigil*=story-popup-context] {
   background: url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"%3E%3Cpath fill="none" d="M0 0h24v24H0z"/%3E%3Cpath fill="%23fff" d="M6 10c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm12 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm-6 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"/%3E%3C/svg%3E') no-repeat !important;
   background-position: center !important;
 }
diff --git a/app/src/main/assets/css/themes/material_glass.scss b/app/src/main/assets/css/themes/material_glass.scss
index 0f14aa5d..0c61a38c 100644
--- a/app/src/main/assets/css/themes/material_glass.scss
+++ b/app/src/main/assets/css/themes/material_glass.scss
@@ -1,4 +1,5 @@
 $text: #fff;
+$accent_text: #fff;
 $link: #5d86dd;
 $accent: #5d86dd;
 $background: rgba(#000, 0.1);
diff --git a/app/src/main/assets/css/themes/material_light.css b/app/src/main/assets/css/themes/material_light.css
index ccfa0990..c00dd12f 100644
--- a/app/src/main/assets/css/themes/material_light.css
+++ b/app/src/main/assets/css/themes/material_light.css
@@ -4,7 +4,7 @@
 ._z-z, ._z-v, ._1e8d, ._36nl, ._36nm, ._2_11, ._2_rf, ._2ip_, ._403p, .cq, ._usr,
 ._5xu2, ._3ml8, ._3mla, ._50vk, ._1m2u, ._31y7, ._4kcb, ._1lf6, ._1lf5,
 ._1lf4, ._1hiz, ._xod, ._5ag5, ._zmk, ._3t_h, ._5lm6, ._3clv, ._3zlc, ._36rd,
-._31zk, ._31zl, ._3xsa, ._3xs9, ._2-4s, ._2fzz ul,
+._31zk, ._31zl, ._3xsa, ._3xs9, ._2-4s, ._2fzz ul, ._3z10,
 ._43mh, .touch .btn, .fcg, button, ._52j9, ._52jb, ._52ja, ._5j35,
 ._rnk, ._24u0, ._1g06, ._14ye, .fcb, ._56cz._56c_, ._1gk_, ._55fj, ._45fu,
 ._18qg, ._1_ac, ._529p, ._4dwt ._1vh3, ._4a5f, ._23_t, ._2rzc, ._23_s, ._2rzd,
@@ -124,14 +124,14 @@ button ._v89 ._54k8._1fl1 {
   border-left: 1px solid rgba(0, 0, 0, 0.3) !important;
 }
 
-._4_d1 {
+._4_d1, ._5cni {
   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,
 ._15n_, ._3-2-, ._27ve, ._2s20, ._gui, ._2s21 > *::after, ._32qk, ._d00, ._d01, ._38o9,
-._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils,
+._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils, ._5as0, ._5as2,
 ._52x1, ._3wjp, ._usq, ._2cul:before, ._13e_, .jewel .flyout, ._3bg5 ._52x6, ._56d8, .al {
   border-top: 1px solid rgba(0, 0, 0, 0.3) !important;
 }
@@ -208,6 +208,20 @@ button ._v89 ._54k8._1fl1 {
   border-bottom: 1px solid #000 !important;
 }
 
+._34ee {
+  background: rgba(230, 230, 230, 0.35) !important;
+  color: #000 !important;
+}
+
+._34em ._34ee {
+  background: #3b5998 !important;
+  color: #fff !important;
+}
+
+._5as0, ._5cni, ._5as2 {
+  background: #fafafa !important;
+}
+
 *, *::after, *::before {
   text-shadow: none !important;
   box-shadow: none !important;
@@ -298,12 +312,6 @@ button ._v89 ._54k8._1fl1 {
   background: url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" fill="%23000" viewBox="0 0 50 50"%3E%3Cpath fill="none" d="M13 26h24v24H13z"/%3E%3Cpath d="M30 31.5V28c0-.55-.45-1-1-1H17c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h12c.55 0 1-.45 1-1v-3.5l4 4v-11l-4 4z"/%3E%3C/svg%3E') no-repeat !important;
 }
 
-/*
- * 2018/12/29
- * Previously ._15km ._15ko::before and ._15km ._15ko._77la::before; however, reaction changes no longer affect this element
- * The robust measure seems to be the parent of a[data-sigil~="like-reaction-flyout"] along with [data-sigil~="like"] for an unliked post
- * and [data-sigil~="unlike"] for a liked post
- */
 ._15km ._15ko::before {
   background: url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" fill="%23000" viewBox="0 0 24 24"%3E%3Cpath fill="none" d="M0 0h24v24H0z"/%3E%3Cpath d="M1 21h4V9H1v12zm22-11c0-1.1-.9-2-2-2h-6.31l.95-4.57.03-.32c0-.41-.17-.79-.44-1.06L14.17 1 7.59 7.59C7.22 7.95 7 8.45 7 9v10c0 1.1.9 2 2 2h9c.83 0 1.54-.5 1.84-1.22l3.02-7.05c.09-.23.14-.47.14-.73v-1.91l-.01-.01L23 10z"/%3E%3C/svg%3E') no-repeat !important;
   background-position: center !important;
@@ -324,7 +332,7 @@ button ._v89 ._54k8._1fl1 {
   background-position: center !important;
 }
 
-.sp_89zNula0Qh5, .sp_89zNula0Qh5_2x, .sp_89zNula0Qh5_3x, .sp_MP2OtCXORz9, .sp_MP2OtCXORz9_2x, .sp_MP2OtCXORz9_3x, .sp_NIWBacTn8LF, .sp_NIWBacTn8LF_2x, .sp_NIWBacTn8LF_3x, .sp_9ZFVhnFyWsw, .sp_9ZFVhnFyWsw_2x, .sp_9ZFVhnFyWsw_3x {
+.story_body_container i.img[data-sigil*=story-popup-context] {
   background: url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"%3E%3Cpath fill="none" d="M0 0h24v24H0z"/%3E%3Cpath fill="%23000" d="M6 10c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm12 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm-6 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"/%3E%3C/svg%3E') no-repeat !important;
   background-position: center !important;
 }
diff --git a/app/src/main/assets/css/themes/material_light.scss b/app/src/main/assets/css/themes/material_light.scss
index b0a16757..7ec58463 100644
--- a/app/src/main/assets/css/themes/material_light.scss
+++ b/app/src/main/assets/css/themes/material_light.scss
@@ -1,4 +1,5 @@
 $text: #000;
+$accent_text: #fff;
 $link: #3b5998;
 $accent: #3b5998;
 $background: #fafafa;
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt
index 37383182..aa6a0130 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt
@@ -20,6 +20,7 @@ import android.content.Intent
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
+import android.webkit.CookieManager
 import android.widget.ImageView
 import android.widget.TextView
 import ca.allanwang.kau.internal.KauBaseActivity
@@ -31,6 +32,7 @@ import com.mikepenz.google_material_typeface_library.GoogleMaterial
 import com.pitchedapps.frost.activities.LoginActivity
 import com.pitchedapps.frost.activities.MainActivity
 import com.pitchedapps.frost.activities.SelectorActivity
+import com.pitchedapps.frost.dbflow.CookieModel
 import com.pitchedapps.frost.dbflow.loadFbCookiesSync
 import com.pitchedapps.frost.facebook.FbCookie
 import com.pitchedapps.frost.utils.EXTRA_COOKIES
@@ -56,6 +58,14 @@ class StartActivity : KauBaseActivity() {
             showInvalidSdkView()
             return
         }
+
+        try {
+            // TODO add better descriptions
+            CookieManager.getInstance()
+        } catch (e: Exception) {
+            showInvalidWebView()
+        }
+
         launch {
             try {
                 FbCookie.switchBackUser()
@@ -64,18 +74,17 @@ class StartActivity : KauBaseActivity() {
                 })
                 L.i { "Cookies loaded at time ${System.currentTimeMillis()}" }
                 L._d { "Cookies: ${cookies.joinToString("\t")}" }
-                loadAssets()
-                if (cookies.isNotEmpty()) {
-                    if (Prefs.userId != -1L)
-                        startActivity<MainActivity>(intentBuilder = {
-                            putParcelableArrayListExtra(EXTRA_COOKIES, cookies)
-                            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or
-                                Intent.FLAG_ACTIVITY_SINGLE_TOP
-                        })
-                    else
-                        launchNewTask<SelectorActivity>(cookies)
-                } else
-                    launchNewTask<LoginActivity>()
+                loadAssets()              
+                when {
+                    cookies.isEmpty() -> launchNewTask<LoginActivity>()
+                    // Has cookies but no selected account
+                    Prefs.userId == -1L -> launchNewTask<SelectorActivity>(cookies)
+                    else -> startActivity<MainActivity>(intentBuilder = {
+                        putParcelableArrayListExtra(EXTRA_COOKIES, cookies)
+                        flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or
+                            Intent.FLAG_ACTIVITY_SINGLE_TOP
+                    })
+                }
             } catch (e: Exception) {
                 showInvalidWebView()
             }
@@ -87,7 +96,7 @@ class StartActivity : KauBaseActivity() {
 
     private fun showInvalidSdkView() {
         val text = try {
-            String.format(getString(R.string.error_sdk), Build.VERSION.SDK_INT)
+            String.format(string(R.string.error_sdk), Build.VERSION.SDK_INT)
         } catch (e: IllegalFormatException) {
             string(R.string.error_sdk)
         }
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 77cb4de1..0caeda1a 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt
@@ -63,6 +63,7 @@ enum class CssAssets(val folder: String = THEME_FOLDER) : InjectorContract {
                     .replace("\$T\$", Prefs.textColor.toRgbaString())
                     .replace("\$TT\$", Prefs.textColor.colorToBackground(0.05f).toRgbaString())
                     .replace("\$A\$", Prefs.accentColor.toRgbaString())
+                    .replace("\$AT\$", Prefs.iconColor.toRgbaString())
                     .replace("\$B\$", Prefs.bgColor.toRgbaString())
                     .replace("\$BT\$", bt)
                     .replace("\$BBT\$", bb.withAlpha(51).toRgbaString())