Compiled themes. 💅

19 files changed, 2245 insertions, 449 deletions

diff --git a/themes/blue_and_orange/blue_and_orange.css b/themes/blue_and_orange/blue_and_orange.css
index 1509735..4729359 100644
--- a/themes/blue_and_orange/blue_and_orange.css
+++ b/themes/blue_and_orange/blue_and_orange.css
@@ -1,6 +1,6 @@
 /*! =========================================== *
  * BLUE AND ORANGE THEME
- * Version: 4.0.0
+ * Version: v4.0.0-beta15
  * Author: Cristiano Almeida
  * Website: www.csalmeida.com
  * Twitter: @_csalmeida
@@ -45,6 +45,11 @@
   background-color: #0A353F;
   color: #e6eaf0; }
 
+.searchbox-advanced-search-button:active,
+.searchbox-advanced-search-button:focus,
+.searchbox-advanced-search-button:hover {
+  background-color: #0F4C5C; }
+
 .topnav-link, .topnav-link > .topnav-icon {
   color: #fff;
   transition: color .2s ease-in-out; }
@@ -57,35 +62,50 @@
 .topnav-link:hover > .topnav-icon, .topnav-link[aria-current=true] > .topnav-icon {
   color: #ED7D3A; }
 
+.protonmail .text-purple {
+  color: #0F4C5C !important; }
+
+.protonmail .text-purple:hover {
+  color: #e06014 !important; }
+
+#pm_composer .composer .composerHeader-container,
+.composerInputMeta-overlay .composerHeader-container {
+  background: #135e72; }
+
 .conversation.marked::before {
   background: #ED7D3A; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
   background: #fff; }
 
-.conversation.item-container.selected, .conversation.item-container-row.selected {
+.item-container.selected, .item-container-row.selected,
+.item-container.active, .item-is-selected {
   background: rgba(237, 125, 58, 0.1); }
 
-.conversation .item-checkbox:checked + .item-icon {
-  background-color: #ED7D3A;
-  border-color: #ED7D3A; }
-
-.conversation .item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #ED7D3A; }
-
-.conversation .item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #fff; }
-
-.conversation .selectBoxElement-container:hover .item-icon {
+.selectBoxElement-container:hover .item-icon {
   background-color: transparent;
   border: 1px solid #eb6e23; }
-  .conversation .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
+  .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
     fill: #eb6e23; }
 
-.conversation .selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+.selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
   background-color: #eb6e23;
   border-color: #eb6e23; }
 
+.item-checkbox:checked + .item-icon {
+  background-color: #ED7D3A;
+  border-color: #ED7D3A; }
+
+.item-checkbox + .item-icon:hover {
+  background-color: #eb6e23;
+  border-color: #eb6e23; }
+
+.item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #fff; }
+
+.item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #fff; }
+
 .starbutton {
   fill: #ED7D3A !important;
   opacity: 0.7; }
@@ -132,10 +152,36 @@ a:active, a:focus, a:hover,
   background: #eb6e23;
   border: 1px solid #eb6e23; }
 
+.is-active.pm-button--error, .is-active.pm-button--error.pm-button--info, .is-active.pm-button--error.pm-button--redborder, .is-active.pm-button--primary, .is-active.pm-button--primary.pm-button--info, .is-active.pm-button--primary.pm-button--redborder, .is-active.pm-button--warning, .is-active.pm-button--warning.pm-button--info, .is-active.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info:not(div):active, .pm-button--error.pm-button--redborder:not(div):active, .pm-button--error:not(div):active, .pm-button--primary.pm-button--info:not(div):active, .pm-button--primary.pm-button--redborder:not(div):active, .pm-button--primary:not(div):active, .pm-button--warning.pm-button--info:not(div):active, .pm-button--warning.pm-button--redborder:not(div):active, .pm-button--warning:not(div):active, .pm-button-blue.is-active, .pm-button-blue.is-active.pm-button--info, .pm-button-blue.is-active.pm-button--redborder, .pm-button-blue.pm-button--info:not(div):active, .pm-button-blue.pm-button--redborder:not(div):active, .pm-button-blue:not(div):active, .pm-button.is-active.pm-button--error, .pm-button.is-active.pm-button--primary, .pm-button.is-active.pm-button--warning, .pm-button.pm-button--error:not(div):active, .pm-button.pm-button--primary:not(div):active, .pm-button.pm-button--warning:not(div):active, .pm-button.pm-button-blue.is-active, .pm-button.pm-button-blue:not(div):active {
+  background: #e06014;
+  border-color: #e06014; }
+
+.pm-button-blueborder {
+  box-shadow: none;
+  border-color: #0F4C5C;
+  color: #0F4C5C;
+  transition: color .2s ease-in-out, border-color .2s ease-in-out; }
+
+.pm-button-blueborder:hover {
+  box-shadow: none;
+  border-color: #e06014;
+  color: #e06014; }
+
+.is-active.pm-button--primaryborder,
+.pm-button--primaryborder:not(div):active,
+.pm-button-blueborder.is-active,
+.pm-button-blueborder:not(div):active {
+  border-color: #e06014;
+  color: #e06014;
+  background: transparent; }
+
 .pm-toggle-checkbox:checked + .pm-toggle-label:before {
   background: #ED7D3A;
   border-color: #ED7D3A; }
 
+.angular-squire-iframe body a {
+  color: #ED7D3A; }
+
 .fill-pm-blue,
 .message-attachmentIcon .file-outer-icon.is-embedded {
   fill: #ED7D3A; }
@@ -154,6 +200,25 @@ a:active, a:focus, a:hover,
 .pm-simple-table-row-th .fill-primary {
   fill: #ED7D3A; }
 
+.pm-checkbox-fakecheck, .pm-radio-fakeradio {
+  border-color: #0F4C5C; }
+  .pm-checkbox-fakecheck [class*="icon-"], .pm-radio-fakeradio [class*="icon-"] {
+    fill: #0F4C5C; }
+
+[class*="icon-"].color-primary {
+  color: #0F4C5C; }
+  [class*="icon-"].color-primary:hover {
+    color: #e06014; }
+
+.badgeLabel, .badgeLabel-primary {
+  border-color: #e06014; }
+
+.badgeLabel,
+.badgeLabel-blue,
+.badgeLabel-primary,
+.bg-pm-blue {
+  background-color: #e06014; }
+
 .progress-contact {
   color: #ED7D3A; }
   .progress-contact::-moz-progress-bar {
@@ -164,4 +229,7 @@ a:active, a:focus, a:hover,
 .minicalendar-day[aria-pressed="true"],
 .minicalendar-day[aria-current="date"]::before,
 .calendar-monthgrid-day[aria-pressed="true"] .calendar-monthgrid-day-number {
-  background: #99420e; }
+  background: #c85612; }
+
+.minicalendar-day[aria-current="date"][aria-pressed="true"]::before {
+  background: #ED7D3A; }
diff --git a/themes/blue_and_orange/blue_and_orange_full.css b/themes/blue_and_orange/blue_and_orange_full.css
index 320a491..152f2a0 100644
--- a/themes/blue_and_orange/blue_and_orange_full.css
+++ b/themes/blue_and_orange/blue_and_orange_full.css
@@ -1,6 +1,6 @@
 /*! =========================================== *
  * BLUE AND ORANGE THEME
- * Version: 4.0.0
+ * Version: v4.0.0-beta15
  * Author: Cristiano Almeida
  * Website: www.csalmeida.com
  * Twitter: @_csalmeida
@@ -45,6 +45,11 @@
   background-color: #0A353F;
   color: #e6eaf0; }
 
+.searchbox-advanced-search-button:active,
+.searchbox-advanced-search-button:focus,
+.searchbox-advanced-search-button:hover {
+  background-color: #0F4C5C; }
+
 .topnav-link, .topnav-link > .topnav-icon {
   color: #fff;
   transition: color .2s ease-in-out; }
@@ -57,35 +62,50 @@
 .topnav-link:hover > .topnav-icon, .topnav-link[aria-current=true] > .topnav-icon {
   color: #ED7D3A; }
 
+.protonmail .text-purple {
+  color: #0F4C5C !important; }
+
+.protonmail .text-purple:hover {
+  color: #e06014 !important; }
+
+#pm_composer .composer .composerHeader-container,
+.composerInputMeta-overlay .composerHeader-container {
+  background: #135e72; }
+
 .conversation.marked::before {
   background: #ED7D3A; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
   background: #fff; }
 
-.conversation.item-container.selected, .conversation.item-container-row.selected {
+.item-container.selected, .item-container-row.selected,
+.item-container.active, .item-is-selected {
   background: rgba(237, 125, 58, 0.1); }
 
-.conversation .item-checkbox:checked + .item-icon {
-  background-color: #ED7D3A;
-  border-color: #ED7D3A; }
-
-.conversation .item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #ED7D3A; }
-
-.conversation .item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #fff; }
-
-.conversation .selectBoxElement-container:hover .item-icon {
+.selectBoxElement-container:hover .item-icon {
   background-color: transparent;
   border: 1px solid #eb6e23; }
-  .conversation .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
+  .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
     fill: #eb6e23; }
 
-.conversation .selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+.selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+  background-color: #eb6e23;
+  border-color: #eb6e23; }
+
+.item-checkbox:checked + .item-icon {
+  background-color: #ED7D3A;
+  border-color: #ED7D3A; }
+
+.item-checkbox + .item-icon:hover {
   background-color: #eb6e23;
   border-color: #eb6e23; }
 
+.item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #fff; }
+
+.item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #fff; }
+
 .starbutton {
   fill: #ED7D3A !important;
   opacity: 0.7; }
@@ -132,10 +152,36 @@ a:active, a:focus, a:hover,
   background: #eb6e23;
   border: 1px solid #eb6e23; }
 
+.is-active.pm-button--error, .is-active.pm-button--error.pm-button--info, .is-active.pm-button--error.pm-button--redborder, .is-active.pm-button--primary, .is-active.pm-button--primary.pm-button--info, .is-active.pm-button--primary.pm-button--redborder, .is-active.pm-button--warning, .is-active.pm-button--warning.pm-button--info, .is-active.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info:not(div):active, .pm-button--error.pm-button--redborder:not(div):active, .pm-button--error:not(div):active, .pm-button--primary.pm-button--info:not(div):active, .pm-button--primary.pm-button--redborder:not(div):active, .pm-button--primary:not(div):active, .pm-button--warning.pm-button--info:not(div):active, .pm-button--warning.pm-button--redborder:not(div):active, .pm-button--warning:not(div):active, .pm-button-blue.is-active, .pm-button-blue.is-active.pm-button--info, .pm-button-blue.is-active.pm-button--redborder, .pm-button-blue.pm-button--info:not(div):active, .pm-button-blue.pm-button--redborder:not(div):active, .pm-button-blue:not(div):active, .pm-button.is-active.pm-button--error, .pm-button.is-active.pm-button--primary, .pm-button.is-active.pm-button--warning, .pm-button.pm-button--error:not(div):active, .pm-button.pm-button--primary:not(div):active, .pm-button.pm-button--warning:not(div):active, .pm-button.pm-button-blue.is-active, .pm-button.pm-button-blue:not(div):active {
+  background: #e06014;
+  border-color: #e06014; }
+
+.pm-button-blueborder {
+  box-shadow: none;
+  border-color: #0F4C5C;
+  color: #0F4C5C;
+  transition: color .2s ease-in-out, border-color .2s ease-in-out; }
+
+.pm-button-blueborder:hover {
+  box-shadow: none;
+  border-color: #e06014;
+  color: #e06014; }
+
+.is-active.pm-button--primaryborder,
+.pm-button--primaryborder:not(div):active,
+.pm-button-blueborder.is-active,
+.pm-button-blueborder:not(div):active {
+  border-color: #e06014;
+  color: #e06014;
+  background: transparent; }
+
 .pm-toggle-checkbox:checked + .pm-toggle-label:before {
   background: #ED7D3A;
   border-color: #ED7D3A; }
 
+.angular-squire-iframe body a {
+  color: #ED7D3A; }
+
 .fill-pm-blue,
 .message-attachmentIcon .file-outer-icon.is-embedded {
   fill: #ED7D3A; }
@@ -154,6 +200,25 @@ a:active, a:focus, a:hover,
 .pm-simple-table-row-th .fill-primary {
   fill: #ED7D3A; }
 
+.pm-checkbox-fakecheck, .pm-radio-fakeradio {
+  border-color: #0F4C5C; }
+  .pm-checkbox-fakecheck [class*="icon-"], .pm-radio-fakeradio [class*="icon-"] {
+    fill: #0F4C5C; }
+
+[class*="icon-"].color-primary {
+  color: #0F4C5C; }
+  [class*="icon-"].color-primary:hover {
+    color: #e06014; }
+
+.badgeLabel, .badgeLabel-primary {
+  border-color: #e06014; }
+
+.badgeLabel,
+.badgeLabel-blue,
+.badgeLabel-primary,
+.bg-pm-blue {
+  background-color: #e06014; }
+
 .progress-contact {
   color: #ED7D3A; }
   .progress-contact::-moz-progress-bar {
@@ -164,7 +229,10 @@ a:active, a:focus, a:hover,
 .minicalendar-day[aria-pressed="true"],
 .minicalendar-day[aria-current="date"]::before,
 .calendar-monthgrid-day[aria-pressed="true"] .calendar-monthgrid-day-number {
-  background: #99420e; }
+  background: #c85612; }
+
+.minicalendar-day[aria-current="date"][aria-pressed="true"]::before {
+  background: #ED7D3A; }
 
 body {
   scrollbar-color: #167088 #105365; }
@@ -178,12 +246,51 @@ body {
     box-shadow: inset 0 0 0 4px #105365;
     border-radius: 16px; }
 
+.bordered,
+.bordered-container:not([class*="composerInputMeta-"]),
+.breadcrumb-container {
+  border-color: #167088; }
+
+.squireToolbar-select-list {
+  background: #0F4C5C;
+  color: #e6eaf0; }
+
+.squireToolbar-dropdown-divider {
+  background-color: #167088; }
+
+.squireToolbar-select-item:hover {
+  background: #0e4553; }
+
 #pm_composer .composer,
 .composerInputMeta-overlay {
   background: #0F4C5C; }
-  #pm_composer .composer .composerHeader-container,
-  .composerInputMeta-overlay .composerHeader-container {
-    background: #135e72; }
+
+.autocompleteEmails-item {
+  background-color: #0e4553;
+  border-color: #0e4553; }
+
+.autocompleteEmails-label {
+  border-left: 1px solid #167088;
+  border-right: 1px solid #167088; }
+
+.composerOptions-container.show {
+  background: #0e4553; }
+  .composerOptions-container.show .shadow-container {
+    background: #0F4C5C;
+    color: #e6eaf0; }
+
+.is-disabled.pm-button--error, .is-disabled.pm-button--error.pm-button--info, .is-disabled.pm-button--error.pm-button--redborder, .is-disabled.pm-button--primary, .is-disabled.pm-button--primary.pm-button--info, .is-disabled.pm-button--primary.pm-button--redborder, .is-disabled.pm-button--warning, .is-disabled.pm-button--warning.pm-button--info, .is-disabled.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info[disabled], .pm-button--error.pm-button--redborder[disabled], .pm-button--error[disabled], .pm-button--primary.pm-button--info[disabled], .pm-button--primary.pm-button--redborder[disabled], .pm-button--primary[disabled], .pm-button--warning.pm-button--info[disabled], .pm-button--warning.pm-button--redborder[disabled], .pm-button--warning[disabled], .pm-button-blue.is-disabled, .pm-button-blue.is-disabled.pm-button--info, .pm-button-blue.is-disabled.pm-button--redborder, .pm-button-blue.pm-button--info[disabled], .pm-button-blue.pm-button--redborder[disabled], .pm-button-blue[disabled], .pm-button.is-disabled.pm-button--error, .pm-button.is-disabled.pm-button--primary, .pm-button.is-disabled.pm-button--warning, .pm-button.pm-button--error[disabled], .pm-button.pm-button--primary[disabled], .pm-button.pm-button--warning[disabled], .pm-button.pm-button-blue.is-disabled, .pm-button.pm-button-blue[disabled] {
+  background-color: #0e4553;
+  border-color: #167088;
+  color: #082830; }
+
+.pm-button-blueborder {
+  border-color: #ED7D3A;
+  color: #ED7D3A; }
+
+.pm-button-blueborder:hover {
+  border-color: #ef8c51;
+  color: #ef8c51; }
 
 [class*="squireToolbar-row"] .squireToolbar-action-mode:active, [class*="squireToolbar-row"] .squireToolbar-action-mode:hover, [class*="squireToolbar-row"] [class*="squireToolbar-action-"]:active, [class*="squireToolbar-row"] [class*="squireToolbar-action-"]:hover {
   background: #105365 !important; }
@@ -208,6 +315,9 @@ body {
 [class*="block-info-"] {
   color: #e6eaf0; }
 
+[class*="block-info"] {
+  background-color: #167088; }
+
 .fill-global-grey {
   fill: #ED7D3A; }
 
@@ -220,8 +330,14 @@ body {
 .item-container, .item-container-row, .contactsummary-container {
   background: #0F4C5C; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active),
-.conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .squireToolbar-container {
+.items-column-list-inner, .ReactVirtualized__Grid__innerScrollContainer {
+  border-color: #167088; }
+  .items-column-list-inner .item-container, .items-column-list-inner .item-container-row, .ReactVirtualized__Grid__innerScrollContainer .item-container, .ReactVirtualized__Grid__innerScrollContainer .item-container-row {
+    border-color: #167088; }
+
+.item-container:not(.item-is-selected):not(.read):not(.active),
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active),
+.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .squireToolbar-container {
   background: #135e72; }
 
 .item-container.active, .item-is-selected {
@@ -273,15 +389,16 @@ details:first-child {
 .message-infobox {
   background-color: #0F4C5C; }
 
-.bordered,
-.bordered-container:not([class*="composerInputMeta-"]),
-.breadcrumb-container {
-  border-color: #167088; }
-
 .message-content.frame.message-frame {
   background: white;
   color: black; }
 
+.angular-squire-iframe body {
+  color: #e6eaf0;
+  background: #135e72; }
+  .angular-squire-iframe body a {
+    color: #ED7D3A; }
+
 .pm-button, .pm-button--info, .pm-button--redborder {
   background: #0F4C5C;
   border-color: #167088;
@@ -446,16 +563,23 @@ select.pm-field, select.pm-field-icon-container {
 .pm-plans-table-row--highlighted {
   background-color: #0F4C5C; }
 
+.pm-checkbox-fakecheck,
+.pm-radio-fakeradio {
+  border-color: #ED7D3A;
+  background: transparent; }
+
+[class*="icon-"].color-primary {
+  color: #ED7D3A; }
+
+.color-global-grey-dm {
+  color: #ED7D3A; }
+
 .calendar-grid-heading, .calendar-monthgrid-day {
   color: #e6eaf0; }
 
 .calendar-grid-heading[aria-current="date"] {
   color: white; }
 
-.pm-checkbox-fakecheck {
-  border-color: #ED7D3A;
-  background: transparent; }
-
 .calendar-daygrid-weeknumber {
   background-color: #082830; }
 
diff --git a/themes/dark_bubble_gum/dark_bubble_gum.css b/themes/dark_bubble_gum/dark_bubble_gum.css
index 2300e9f..49d0e91 100644
--- a/themes/dark_bubble_gum/dark_bubble_gum.css
+++ b/themes/dark_bubble_gum/dark_bubble_gum.css
@@ -1,6 +1,6 @@
 /*! =========================================== *
  * DARK BUBBLE GUM THEME
- * Version: 4.0.0
+ * Version: v4.0.0-beta15
  * Author: Cristiano Almeida
  * Website: www.csalmeida.com
  * Twitter: @_csalmeida
@@ -45,6 +45,11 @@
   background-color: #000;
   color: #e6eaf0; }
 
+.searchbox-advanced-search-button:active,
+.searchbox-advanced-search-button:focus,
+.searchbox-advanced-search-button:hover {
+  background-color: #1C1C1C; }
+
 .topnav-link, .topnav-link > .topnav-icon {
   color: #fff;
   transition: color .2s ease-in-out; }
@@ -57,35 +62,50 @@
 .topnav-link:hover > .topnav-icon, .topnav-link[aria-current=true] > .topnav-icon {
   color: #EF2D56; }
 
+.protonmail .text-purple {
+  color: #1C1C1C !important; }
+
+.protonmail .text-purple:hover {
+  color: #d9103b !important; }
+
+#pm_composer .composer .composerHeader-container,
+.composerInputMeta-overlay .composerHeader-container {
+  background: #292929; }
+
 .conversation.marked::before {
   background: #EF2D56; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
   background: #fff; }
 
-.conversation.item-container.selected, .conversation.item-container-row.selected {
+.item-container.selected, .item-container-row.selected,
+.item-container.active, .item-is-selected {
   background: rgba(239, 45, 86, 0.1); }
 
-.conversation .item-checkbox:checked + .item-icon {
-  background-color: #EF2D56;
-  border-color: #EF2D56; }
-
-.conversation .item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #EF2D56; }
-
-.conversation .item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #fff; }
-
-.conversation .selectBoxElement-container:hover .item-icon {
+.selectBoxElement-container:hover .item-icon {
   background-color: transparent;
   border: 1px solid #ed1543; }
-  .conversation .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
+  .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
     fill: #ed1543; }
 
-.conversation .selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+.selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
   background-color: #ed1543;
   border-color: #ed1543; }
 
+.item-checkbox:checked + .item-icon {
+  background-color: #EF2D56;
+  border-color: #EF2D56; }
+
+.item-checkbox + .item-icon:hover {
+  background-color: #ed1543;
+  border-color: #ed1543; }
+
+.item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #fff; }
+
+.item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #fff; }
+
 .starbutton {
   fill: #EF2D56 !important;
   opacity: 0.7; }
@@ -132,10 +152,36 @@ a:active, a:focus, a:hover,
   background: #ed1543;
   border: 1px solid #ed1543; }
 
+.is-active.pm-button--error, .is-active.pm-button--error.pm-button--info, .is-active.pm-button--error.pm-button--redborder, .is-active.pm-button--primary, .is-active.pm-button--primary.pm-button--info, .is-active.pm-button--primary.pm-button--redborder, .is-active.pm-button--warning, .is-active.pm-button--warning.pm-button--info, .is-active.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info:not(div):active, .pm-button--error.pm-button--redborder:not(div):active, .pm-button--error:not(div):active, .pm-button--primary.pm-button--info:not(div):active, .pm-button--primary.pm-button--redborder:not(div):active, .pm-button--primary:not(div):active, .pm-button--warning.pm-button--info:not(div):active, .pm-button--warning.pm-button--redborder:not(div):active, .pm-button--warning:not(div):active, .pm-button-blue.is-active, .pm-button-blue.is-active.pm-button--info, .pm-button-blue.is-active.pm-button--redborder, .pm-button-blue.pm-button--info:not(div):active, .pm-button-blue.pm-button--redborder:not(div):active, .pm-button-blue:not(div):active, .pm-button.is-active.pm-button--error, .pm-button.is-active.pm-button--primary, .pm-button.is-active.pm-button--warning, .pm-button.pm-button--error:not(div):active, .pm-button.pm-button--primary:not(div):active, .pm-button.pm-button--warning:not(div):active, .pm-button.pm-button-blue.is-active, .pm-button.pm-button-blue:not(div):active {
+  background: #d9103b;
+  border-color: #d9103b; }
+
+.pm-button-blueborder {
+  box-shadow: none;
+  border-color: #1C1C1C;
+  color: #1C1C1C;
+  transition: color .2s ease-in-out, border-color .2s ease-in-out; }
+
+.pm-button-blueborder:hover {
+  box-shadow: none;
+  border-color: #d9103b;
+  color: #d9103b; }
+
+.is-active.pm-button--primaryborder,
+.pm-button--primaryborder:not(div):active,
+.pm-button-blueborder.is-active,
+.pm-button-blueborder:not(div):active {
+  border-color: #d9103b;
+  color: #d9103b;
+  background: transparent; }
+
 .pm-toggle-checkbox:checked + .pm-toggle-label:before {
   background: #EF2D56;
   border-color: #EF2D56; }
 
+.angular-squire-iframe body a {
+  color: #EF2D56; }
+
 .fill-pm-blue,
 .message-attachmentIcon .file-outer-icon.is-embedded {
   fill: #EF2D56; }
@@ -154,6 +200,25 @@ a:active, a:focus, a:hover,
 .pm-simple-table-row-th .fill-primary {
   fill: #EF2D56; }
 
+.pm-checkbox-fakecheck, .pm-radio-fakeradio {
+  border-color: #1C1C1C; }
+  .pm-checkbox-fakecheck [class*="icon-"], .pm-radio-fakeradio [class*="icon-"] {
+    fill: #1C1C1C; }
+
+[class*="icon-"].color-primary {
+  color: #1C1C1C; }
+  [class*="icon-"].color-primary:hover {
+    color: #d9103b; }
+
+.badgeLabel, .badgeLabel-primary {
+  border-color: #d9103b; }
+
+.badgeLabel,
+.badgeLabel-blue,
+.badgeLabel-primary,
+.bg-pm-blue {
+  background-color: #d9103b; }
+
 .progress-contact {
   color: #EF2D56; }
   .progress-contact::-moz-progress-bar {
@@ -164,4 +229,7 @@ a:active, a:focus, a:hover,
 .minicalendar-day[aria-pressed="true"],
 .minicalendar-day[aria-current="date"]::before,
 .calendar-monthgrid-day[aria-pressed="true"] .calendar-monthgrid-day-number {
-  background: #910b27; }
+  background: #c10f34; }
+
+.minicalendar-day[aria-current="date"][aria-pressed="true"]::before {
+  background: #EF2D56; }
diff --git a/themes/dark_bubble_gum/dark_bubble_gum_full.css b/themes/dark_bubble_gum/dark_bubble_gum_full.css
index 78abd8c..81ebb0c 100644
--- a/themes/dark_bubble_gum/dark_bubble_gum_full.css
+++ b/themes/dark_bubble_gum/dark_bubble_gum_full.css
@@ -1,6 +1,6 @@
 /*! =========================================== *
  * DARK BUBBLE GUM THEME
- * Version: 4.0.0
+ * Version: v4.0.0-beta15
  * Author: Cristiano Almeida
  * Website: www.csalmeida.com
  * Twitter: @_csalmeida
@@ -45,6 +45,11 @@
   background-color: #000;
   color: #e6eaf0; }
 
+.searchbox-advanced-search-button:active,
+.searchbox-advanced-search-button:focus,
+.searchbox-advanced-search-button:hover {
+  background-color: #1C1C1C; }
+
 .topnav-link, .topnav-link > .topnav-icon {
   color: #fff;
   transition: color .2s ease-in-out; }
@@ -57,35 +62,50 @@
 .topnav-link:hover > .topnav-icon, .topnav-link[aria-current=true] > .topnav-icon {
   color: #EF2D56; }
 
+.protonmail .text-purple {
+  color: #1C1C1C !important; }
+
+.protonmail .text-purple:hover {
+  color: #d9103b !important; }
+
+#pm_composer .composer .composerHeader-container,
+.composerInputMeta-overlay .composerHeader-container {
+  background: #292929; }
+
 .conversation.marked::before {
   background: #EF2D56; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
   background: #fff; }
 
-.conversation.item-container.selected, .conversation.item-container-row.selected {
+.item-container.selected, .item-container-row.selected,
+.item-container.active, .item-is-selected {
   background: rgba(239, 45, 86, 0.1); }
 
-.conversation .item-checkbox:checked + .item-icon {
-  background-color: #EF2D56;
-  border-color: #EF2D56; }
-
-.conversation .item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #EF2D56; }
-
-.conversation .item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #fff; }
-
-.conversation .selectBoxElement-container:hover .item-icon {
+.selectBoxElement-container:hover .item-icon {
   background-color: transparent;
   border: 1px solid #ed1543; }
-  .conversation .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
+  .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
     fill: #ed1543; }
 
-.conversation .selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+.selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+  background-color: #ed1543;
+  border-color: #ed1543; }
+
+.item-checkbox:checked + .item-icon {
+  background-color: #EF2D56;
+  border-color: #EF2D56; }
+
+.item-checkbox + .item-icon:hover {
   background-color: #ed1543;
   border-color: #ed1543; }
 
+.item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #fff; }
+
+.item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #fff; }
+
 .starbutton {
   fill: #EF2D56 !important;
   opacity: 0.7; }
@@ -132,10 +152,36 @@ a:active, a:focus, a:hover,
   background: #ed1543;
   border: 1px solid #ed1543; }
 
+.is-active.pm-button--error, .is-active.pm-button--error.pm-button--info, .is-active.pm-button--error.pm-button--redborder, .is-active.pm-button--primary, .is-active.pm-button--primary.pm-button--info, .is-active.pm-button--primary.pm-button--redborder, .is-active.pm-button--warning, .is-active.pm-button--warning.pm-button--info, .is-active.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info:not(div):active, .pm-button--error.pm-button--redborder:not(div):active, .pm-button--error:not(div):active, .pm-button--primary.pm-button--info:not(div):active, .pm-button--primary.pm-button--redborder:not(div):active, .pm-button--primary:not(div):active, .pm-button--warning.pm-button--info:not(div):active, .pm-button--warning.pm-button--redborder:not(div):active, .pm-button--warning:not(div):active, .pm-button-blue.is-active, .pm-button-blue.is-active.pm-button--info, .pm-button-blue.is-active.pm-button--redborder, .pm-button-blue.pm-button--info:not(div):active, .pm-button-blue.pm-button--redborder:not(div):active, .pm-button-blue:not(div):active, .pm-button.is-active.pm-button--error, .pm-button.is-active.pm-button--primary, .pm-button.is-active.pm-button--warning, .pm-button.pm-button--error:not(div):active, .pm-button.pm-button--primary:not(div):active, .pm-button.pm-button--warning:not(div):active, .pm-button.pm-button-blue.is-active, .pm-button.pm-button-blue:not(div):active {
+  background: #d9103b;
+  border-color: #d9103b; }
+
+.pm-button-blueborder {
+  box-shadow: none;
+  border-color: #1C1C1C;
+  color: #1C1C1C;
+  transition: color .2s ease-in-out, border-color .2s ease-in-out; }
+
+.pm-button-blueborder:hover {
+  box-shadow: none;
+  border-color: #d9103b;
+  color: #d9103b; }
+
+.is-active.pm-button--primaryborder,
+.pm-button--primaryborder:not(div):active,
+.pm-button-blueborder.is-active,
+.pm-button-blueborder:not(div):active {
+  border-color: #d9103b;
+  color: #d9103b;
+  background: transparent; }
+
 .pm-toggle-checkbox:checked + .pm-toggle-label:before {
   background: #EF2D56;
   border-color: #EF2D56; }
 
+.angular-squire-iframe body a {
+  color: #EF2D56; }
+
 .fill-pm-blue,
 .message-attachmentIcon .file-outer-icon.is-embedded {
   fill: #EF2D56; }
@@ -154,6 +200,25 @@ a:active, a:focus, a:hover,
 .pm-simple-table-row-th .fill-primary {
   fill: #EF2D56; }
 
+.pm-checkbox-fakecheck, .pm-radio-fakeradio {
+  border-color: #1C1C1C; }
+  .pm-checkbox-fakecheck [class*="icon-"], .pm-radio-fakeradio [class*="icon-"] {
+    fill: #1C1C1C; }
+
+[class*="icon-"].color-primary {
+  color: #1C1C1C; }
+  [class*="icon-"].color-primary:hover {
+    color: #d9103b; }
+
+.badgeLabel, .badgeLabel-primary {
+  border-color: #d9103b; }
+
+.badgeLabel,
+.badgeLabel-blue,
+.badgeLabel-primary,
+.bg-pm-blue {
+  background-color: #d9103b; }
+
 .progress-contact {
   color: #EF2D56; }
   .progress-contact::-moz-progress-bar {
@@ -164,7 +229,10 @@ a:active, a:focus, a:hover,
 .minicalendar-day[aria-pressed="true"],
 .minicalendar-day[aria-current="date"]::before,
 .calendar-monthgrid-day[aria-pressed="true"] .calendar-monthgrid-day-number {
-  background: #910b27; }
+  background: #c10f34; }
+
+.minicalendar-day[aria-current="date"][aria-pressed="true"]::before {
+  background: #EF2D56; }
 
 body {
   scrollbar-color: #363636 #212121; }
@@ -178,12 +246,51 @@ body {
     box-shadow: inset 0 0 0 4px #212121;
     border-radius: 16px; }
 
+.bordered,
+.bordered-container:not([class*="composerInputMeta-"]),
+.breadcrumb-container {
+  border-color: #363636; }
+
+.squireToolbar-select-list {
+  background: #1C1C1C;
+  color: #e6eaf0; }
+
+.squireToolbar-dropdown-divider {
+  background-color: #363636; }
+
+.squireToolbar-select-item:hover {
+  background: #171717; }
+
 #pm_composer .composer,
 .composerInputMeta-overlay {
   background: #1C1C1C; }
-  #pm_composer .composer .composerHeader-container,
-  .composerInputMeta-overlay .composerHeader-container {
-    background: #292929; }
+
+.autocompleteEmails-item {
+  background-color: #171717;
+  border-color: #171717; }
+
+.autocompleteEmails-label {
+  border-left: 1px solid #363636;
+  border-right: 1px solid #363636; }
+
+.composerOptions-container.show {
+  background: #171717; }
+  .composerOptions-container.show .shadow-container {
+    background: #1C1C1C;
+    color: #e6eaf0; }
+
+.is-disabled.pm-button--error, .is-disabled.pm-button--error.pm-button--info, .is-disabled.pm-button--error.pm-button--redborder, .is-disabled.pm-button--primary, .is-disabled.pm-button--primary.pm-button--info, .is-disabled.pm-button--primary.pm-button--redborder, .is-disabled.pm-button--warning, .is-disabled.pm-button--warning.pm-button--info, .is-disabled.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info[disabled], .pm-button--error.pm-button--redborder[disabled], .pm-button--error[disabled], .pm-button--primary.pm-button--info[disabled], .pm-button--primary.pm-button--redborder[disabled], .pm-button--primary[disabled], .pm-button--warning.pm-button--info[disabled], .pm-button--warning.pm-button--redborder[disabled], .pm-button--warning[disabled], .pm-button-blue.is-disabled, .pm-button-blue.is-disabled.pm-button--info, .pm-button-blue.is-disabled.pm-button--redborder, .pm-button-blue.pm-button--info[disabled], .pm-button-blue.pm-button--redborder[disabled], .pm-button-blue[disabled], .pm-button.is-disabled.pm-button--error, .pm-button.is-disabled.pm-button--primary, .pm-button.is-disabled.pm-button--warning, .pm-button.pm-button--error[disabled], .pm-button.pm-button--primary[disabled], .pm-button.pm-button--warning[disabled], .pm-button.pm-button-blue.is-disabled, .pm-button.pm-button-blue[disabled] {
+  background-color: #171717;
+  border-color: #363636;
+  color: #030303; }
+
+.pm-button-blueborder {
+  border-color: #EF2D56;
+  color: #EF2D56; }
+
+.pm-button-blueborder:hover {
+  border-color: #f14569;
+  color: #f14569; }
 
 [class*="squireToolbar-row"] .squireToolbar-action-mode:active, [class*="squireToolbar-row"] .squireToolbar-action-mode:hover, [class*="squireToolbar-row"] [class*="squireToolbar-action-"]:active, [class*="squireToolbar-row"] [class*="squireToolbar-action-"]:hover {
   background: #212121 !important; }
@@ -208,6 +315,9 @@ body {
 [class*="block-info-"] {
   color: #e6eaf0; }
 
+[class*="block-info"] {
+  background-color: #363636; }
+
 .fill-global-grey {
   fill: #EF2D56; }
 
@@ -220,8 +330,14 @@ body {
 .item-container, .item-container-row, .contactsummary-container {
   background: #1C1C1C; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active),
-.conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .squireToolbar-container {
+.items-column-list-inner, .ReactVirtualized__Grid__innerScrollContainer {
+  border-color: #363636; }
+  .items-column-list-inner .item-container, .items-column-list-inner .item-container-row, .ReactVirtualized__Grid__innerScrollContainer .item-container, .ReactVirtualized__Grid__innerScrollContainer .item-container-row {
+    border-color: #363636; }
+
+.item-container:not(.item-is-selected):not(.read):not(.active),
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active),
+.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .squireToolbar-container {
   background: #292929; }
 
 .item-container.active, .item-is-selected {
@@ -273,15 +389,16 @@ details:first-child {
 .message-infobox {
   background-color: #1C1C1C; }
 
-.bordered,
-.bordered-container:not([class*="composerInputMeta-"]),
-.breadcrumb-container {
-  border-color: #363636; }
-
 .message-content.frame.message-frame {
   background: white;
   color: black; }
 
+.angular-squire-iframe body {
+  color: #e6eaf0;
+  background: #292929; }
+  .angular-squire-iframe body a {
+    color: #EF2D56; }
+
 .pm-button, .pm-button--info, .pm-button--redborder {
   background: #1C1C1C;
   border-color: #363636;
@@ -446,16 +563,23 @@ select.pm-field, select.pm-field-icon-container {
 .pm-plans-table-row--highlighted {
   background-color: #1C1C1C; }
 
+.pm-checkbox-fakecheck,
+.pm-radio-fakeradio {
+  border-color: #EF2D56;
+  background: transparent; }
+
+[class*="icon-"].color-primary {
+  color: #EF2D56; }
+
+.color-global-grey-dm {
+  color: #EF2D56; }
+
 .calendar-grid-heading, .calendar-monthgrid-day {
   color: #e6eaf0; }
 
 .calendar-grid-heading[aria-current="date"] {
   color: white; }
 
-.pm-checkbox-fakecheck {
-  border-color: #EF2D56;
-  background: transparent; }
-
 .calendar-daygrid-weeknumber {
   background-color: #030303; }
 
diff --git a/themes/deutera_one/deutera_one.css b/themes/deutera_one/deutera_one.css
index 0901fed..d7bbed7 100644
--- a/themes/deutera_one/deutera_one.css
+++ b/themes/deutera_one/deutera_one.css
@@ -1,6 +1,6 @@
 /*! =========================================== *
  * DEUTERA ONE THEME
- * Version: 4.0.0
+ * Version: v4.0.0-beta15
  * Author: Cristiano Almeida
  * Website: www.csalmeida.com
  * Twitter: @_csalmeida
@@ -45,6 +45,11 @@
   background-color: #08426b;
   color: #e6eaf0; }
 
+.searchbox-advanced-search-button:active,
+.searchbox-advanced-search-button:focus,
+.searchbox-advanced-search-button:hover {
+  background-color: #000076; }
+
 .topnav-link, .topnav-link > .topnav-icon {
   color: #fff;
   transition: color .2s ease-in-out; }
@@ -57,35 +62,50 @@
 .topnav-link:hover > .topnav-icon, .topnav-link[aria-current=true] > .topnav-icon {
   color: #ffed00; }
 
+.protonmail .text-purple {
+  color: #000076 !important; }
+
+.protonmail .text-purple:hover {
+  color: #ccbe00 !important; }
+
+#pm_composer .composer .composerHeader-container,
+.composerInputMeta-overlay .composerHeader-container {
+  background: #000090; }
+
 .conversation.marked::before {
   background: #ffed00; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
   background: #fff; }
 
-.conversation.item-container.selected, .conversation.item-container-row.selected {
+.item-container.selected, .item-container-row.selected,
+.item-container.active, .item-is-selected {
   background: rgba(255, 237, 0, 0.1); }
 
-.conversation .item-checkbox:checked + .item-icon {
-  background-color: #ffed00;
-  border-color: #ffed00; }
-
-.conversation .item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #ffed00; }
-
-.conversation .item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #fff; }
-
-.conversation .selectBoxElement-container:hover .item-icon {
+.selectBoxElement-container:hover .item-icon {
   background-color: transparent;
   border: 1px solid #e6d500; }
-  .conversation .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
+  .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
     fill: #e6d500; }
 
-.conversation .selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+.selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+  background-color: #e6d500;
+  border-color: #e6d500; }
+
+.item-checkbox:checked + .item-icon {
+  background-color: #ffed00;
+  border-color: #ffed00; }
+
+.item-checkbox + .item-icon:hover {
   background-color: #e6d500;
   border-color: #e6d500; }
 
+.item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #fff; }
+
+.item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #fff; }
+
 .starbutton {
   fill: #ffed00 !important;
   opacity: 0.7; }
@@ -132,10 +152,36 @@ a:active, a:focus, a:hover,
   background: #e6d500;
   border: 1px solid #e6d500; }
 
+.is-active.pm-button--error, .is-active.pm-button--error.pm-button--info, .is-active.pm-button--error.pm-button--redborder, .is-active.pm-button--primary, .is-active.pm-button--primary.pm-button--info, .is-active.pm-button--primary.pm-button--redborder, .is-active.pm-button--warning, .is-active.pm-button--warning.pm-button--info, .is-active.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info:not(div):active, .pm-button--error.pm-button--redborder:not(div):active, .pm-button--error:not(div):active, .pm-button--primary.pm-button--info:not(div):active, .pm-button--primary.pm-button--redborder:not(div):active, .pm-button--primary:not(div):active, .pm-button--warning.pm-button--info:not(div):active, .pm-button--warning.pm-button--redborder:not(div):active, .pm-button--warning:not(div):active, .pm-button-blue.is-active, .pm-button-blue.is-active.pm-button--info, .pm-button-blue.is-active.pm-button--redborder, .pm-button-blue.pm-button--info:not(div):active, .pm-button-blue.pm-button--redborder:not(div):active, .pm-button-blue:not(div):active, .pm-button.is-active.pm-button--error, .pm-button.is-active.pm-button--primary, .pm-button.is-active.pm-button--warning, .pm-button.pm-button--error:not(div):active, .pm-button.pm-button--primary:not(div):active, .pm-button.pm-button--warning:not(div):active, .pm-button.pm-button-blue.is-active, .pm-button.pm-button-blue:not(div):active {
+  background: #ccbe00;
+  border-color: #ccbe00; }
+
+.pm-button-blueborder {
+  box-shadow: none;
+  border-color: #000076;
+  color: #000076;
+  transition: color .2s ease-in-out, border-color .2s ease-in-out; }
+
+.pm-button-blueborder:hover {
+  box-shadow: none;
+  border-color: #ccbe00;
+  color: #ccbe00; }
+
+.is-active.pm-button--primaryborder,
+.pm-button--primaryborder:not(div):active,
+.pm-button-blueborder.is-active,
+.pm-button-blueborder:not(div):active {
+  border-color: #ccbe00;
+  color: #ccbe00;
+  background: transparent; }
+
 .pm-toggle-checkbox:checked + .pm-toggle-label:before {
   background: #ffed00;
   border-color: #ffed00; }
 
+.angular-squire-iframe body a {
+  color: #ffed00; }
+
 .fill-pm-blue,
 .message-attachmentIcon .file-outer-icon.is-embedded {
   fill: #ffed00; }
@@ -154,6 +200,25 @@ a:active, a:focus, a:hover,
 .pm-simple-table-row-th .fill-primary {
   fill: #ffed00; }
 
+.pm-checkbox-fakecheck, .pm-radio-fakeradio {
+  border-color: #000076; }
+  .pm-checkbox-fakecheck [class*="icon-"], .pm-radio-fakeradio [class*="icon-"] {
+    fill: #000076; }
+
+[class*="icon-"].color-primary {
+  color: #000076; }
+  [class*="icon-"].color-primary:hover {
+    color: #ccbe00; }
+
+.badgeLabel, .badgeLabel-primary {
+  border-color: #ccbe00; }
+
+.badgeLabel,
+.badgeLabel-blue,
+.badgeLabel-primary,
+.bg-pm-blue {
+  background-color: #ccbe00; }
+
 .progress-contact {
   color: #ffed00; }
   .progress-contact::-moz-progress-bar {
@@ -164,7 +229,10 @@ a:active, a:focus, a:hover,
 .minicalendar-day[aria-pressed="true"],
 .minicalendar-day[aria-current="date"]::before,
 .calendar-monthgrid-day[aria-pressed="true"] .calendar-monthgrid-day-number {
-  background: #807700; }
+  background: #b3a600; }
+
+.minicalendar-day[aria-current="date"][aria-pressed="true"]::before {
+  background: #ffed00; }
 
 .pm-button--error, .pm-button--primary, .pm-button--warning, .pm-button-blue {
   color: #fff;
diff --git a/themes/deutera_one/deutera_one_full.css b/themes/deutera_one/deutera_one_full.css
index f2113bc..85cca50 100644
--- a/themes/deutera_one/deutera_one_full.css
+++ b/themes/deutera_one/deutera_one_full.css
@@ -1,6 +1,6 @@
 /*! =========================================== *
  * DEUTERA ONE THEME
- * Version: 4.0.0
+ * Version: v4.0.0-beta15
  * Author: Cristiano Almeida
  * Website: www.csalmeida.com
  * Twitter: @_csalmeida
@@ -45,6 +45,11 @@
   background-color: #08426b;
   color: #e6eaf0; }
 
+.searchbox-advanced-search-button:active,
+.searchbox-advanced-search-button:focus,
+.searchbox-advanced-search-button:hover {
+  background-color: #000076; }
+
 .topnav-link, .topnav-link > .topnav-icon {
   color: #fff;
   transition: color .2s ease-in-out; }
@@ -57,35 +62,50 @@
 .topnav-link:hover > .topnav-icon, .topnav-link[aria-current=true] > .topnav-icon {
   color: #ffed00; }
 
+.protonmail .text-purple {
+  color: #000076 !important; }
+
+.protonmail .text-purple:hover {
+  color: #ccbe00 !important; }
+
+#pm_composer .composer .composerHeader-container,
+.composerInputMeta-overlay .composerHeader-container {
+  background: #000090; }
+
 .conversation.marked::before {
   background: #ffed00; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
   background: #fff; }
 
-.conversation.item-container.selected, .conversation.item-container-row.selected {
+.item-container.selected, .item-container-row.selected,
+.item-container.active, .item-is-selected {
   background: rgba(255, 237, 0, 0.1); }
 
-.conversation .item-checkbox:checked + .item-icon {
-  background-color: #ffed00;
-  border-color: #ffed00; }
-
-.conversation .item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #ffed00; }
-
-.conversation .item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #fff; }
-
-.conversation .selectBoxElement-container:hover .item-icon {
+.selectBoxElement-container:hover .item-icon {
   background-color: transparent;
   border: 1px solid #e6d500; }
-  .conversation .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
+  .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
     fill: #e6d500; }
 
-.conversation .selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+.selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
   background-color: #e6d500;
   border-color: #e6d500; }
 
+.item-checkbox:checked + .item-icon {
+  background-color: #ffed00;
+  border-color: #ffed00; }
+
+.item-checkbox + .item-icon:hover {
+  background-color: #e6d500;
+  border-color: #e6d500; }
+
+.item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #fff; }
+
+.item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #fff; }
+
 .starbutton {
   fill: #ffed00 !important;
   opacity: 0.7; }
@@ -132,10 +152,36 @@ a:active, a:focus, a:hover,
   background: #e6d500;
   border: 1px solid #e6d500; }
 
+.is-active.pm-button--error, .is-active.pm-button--error.pm-button--info, .is-active.pm-button--error.pm-button--redborder, .is-active.pm-button--primary, .is-active.pm-button--primary.pm-button--info, .is-active.pm-button--primary.pm-button--redborder, .is-active.pm-button--warning, .is-active.pm-button--warning.pm-button--info, .is-active.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info:not(div):active, .pm-button--error.pm-button--redborder:not(div):active, .pm-button--error:not(div):active, .pm-button--primary.pm-button--info:not(div):active, .pm-button--primary.pm-button--redborder:not(div):active, .pm-button--primary:not(div):active, .pm-button--warning.pm-button--info:not(div):active, .pm-button--warning.pm-button--redborder:not(div):active, .pm-button--warning:not(div):active, .pm-button-blue.is-active, .pm-button-blue.is-active.pm-button--info, .pm-button-blue.is-active.pm-button--redborder, .pm-button-blue.pm-button--info:not(div):active, .pm-button-blue.pm-button--redborder:not(div):active, .pm-button-blue:not(div):active, .pm-button.is-active.pm-button--error, .pm-button.is-active.pm-button--primary, .pm-button.is-active.pm-button--warning, .pm-button.pm-button--error:not(div):active, .pm-button.pm-button--primary:not(div):active, .pm-button.pm-button--warning:not(div):active, .pm-button.pm-button-blue.is-active, .pm-button.pm-button-blue:not(div):active {
+  background: #ccbe00;
+  border-color: #ccbe00; }
+
+.pm-button-blueborder {
+  box-shadow: none;
+  border-color: #000076;
+  color: #000076;
+  transition: color .2s ease-in-out, border-color .2s ease-in-out; }
+
+.pm-button-blueborder:hover {
+  box-shadow: none;
+  border-color: #ccbe00;
+  color: #ccbe00; }
+
+.is-active.pm-button--primaryborder,
+.pm-button--primaryborder:not(div):active,
+.pm-button-blueborder.is-active,
+.pm-button-blueborder:not(div):active {
+  border-color: #ccbe00;
+  color: #ccbe00;
+  background: transparent; }
+
 .pm-toggle-checkbox:checked + .pm-toggle-label:before {
   background: #ffed00;
   border-color: #ffed00; }
 
+.angular-squire-iframe body a {
+  color: #ffed00; }
+
 .fill-pm-blue,
 .message-attachmentIcon .file-outer-icon.is-embedded {
   fill: #ffed00; }
@@ -154,6 +200,25 @@ a:active, a:focus, a:hover,
 .pm-simple-table-row-th .fill-primary {
   fill: #ffed00; }
 
+.pm-checkbox-fakecheck, .pm-radio-fakeradio {
+  border-color: #000076; }
+  .pm-checkbox-fakecheck [class*="icon-"], .pm-radio-fakeradio [class*="icon-"] {
+    fill: #000076; }
+
+[class*="icon-"].color-primary {
+  color: #000076; }
+  [class*="icon-"].color-primary:hover {
+    color: #ccbe00; }
+
+.badgeLabel, .badgeLabel-primary {
+  border-color: #ccbe00; }
+
+.badgeLabel,
+.badgeLabel-blue,
+.badgeLabel-primary,
+.bg-pm-blue {
+  background-color: #ccbe00; }
+
 .progress-contact {
   color: #ffed00; }
   .progress-contact::-moz-progress-bar {
@@ -164,7 +229,10 @@ a:active, a:focus, a:hover,
 .minicalendar-day[aria-pressed="true"],
 .minicalendar-day[aria-current="date"]::before,
 .calendar-monthgrid-day[aria-pressed="true"] .calendar-monthgrid-day-number {
-  background: #807700; }
+  background: #b3a600; }
+
+.minicalendar-day[aria-current="date"][aria-pressed="true"]::before {
+  background: #ffed00; }
 
 body {
   scrollbar-color: #0000a9 navy; }
@@ -178,12 +246,51 @@ body {
     box-shadow: inset 0 0 0 4px navy;
     border-radius: 16px; }
 
+.bordered,
+.bordered-container:not([class*="composerInputMeta-"]),
+.breadcrumb-container {
+  border-color: #0000a9; }
+
+.squireToolbar-select-list {
+  background: #000076;
+  color: #e6eaf0; }
+
+.squireToolbar-dropdown-divider {
+  background-color: #0000a9; }
+
+.squireToolbar-select-item:hover {
+  background: #00006c; }
+
 #pm_composer .composer,
 .composerInputMeta-overlay {
   background: #000076; }
-  #pm_composer .composer .composerHeader-container,
-  .composerInputMeta-overlay .composerHeader-container {
-    background: #000090; }
+
+.autocompleteEmails-item {
+  background-color: #00006c;
+  border-color: #00006c; }
+
+.autocompleteEmails-label {
+  border-left: 1px solid #0000a9;
+  border-right: 1px solid #0000a9; }
+
+.composerOptions-container.show {
+  background: #00006c; }
+  .composerOptions-container.show .shadow-container {
+    background: #000076;
+    color: #e6eaf0; }
+
+.is-disabled.pm-button--error, .is-disabled.pm-button--error.pm-button--info, .is-disabled.pm-button--error.pm-button--redborder, .is-disabled.pm-button--primary, .is-disabled.pm-button--primary.pm-button--info, .is-disabled.pm-button--primary.pm-button--redborder, .is-disabled.pm-button--warning, .is-disabled.pm-button--warning.pm-button--info, .is-disabled.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info[disabled], .pm-button--error.pm-button--redborder[disabled], .pm-button--error[disabled], .pm-button--primary.pm-button--info[disabled], .pm-button--primary.pm-button--redborder[disabled], .pm-button--primary[disabled], .pm-button--warning.pm-button--info[disabled], .pm-button--warning.pm-button--redborder[disabled], .pm-button--warning[disabled], .pm-button-blue.is-disabled, .pm-button-blue.is-disabled.pm-button--info, .pm-button-blue.is-disabled.pm-button--redborder, .pm-button-blue.pm-button--info[disabled], .pm-button-blue.pm-button--redborder[disabled], .pm-button-blue[disabled], .pm-button.is-disabled.pm-button--error, .pm-button.is-disabled.pm-button--primary, .pm-button.is-disabled.pm-button--warning, .pm-button.pm-button--error[disabled], .pm-button.pm-button--primary[disabled], .pm-button.pm-button--warning[disabled], .pm-button.pm-button-blue.is-disabled, .pm-button.pm-button-blue[disabled] {
+  background-color: #00006c;
+  border-color: #0000a9;
+  color: #000043; }
+
+.pm-button-blueborder {
+  border-color: #ffed00;
+  color: #ffed00; }
+
+.pm-button-blueborder:hover {
+  border-color: #ffef1a;
+  color: #ffef1a; }
 
 [class*="squireToolbar-row"] .squireToolbar-action-mode:active, [class*="squireToolbar-row"] .squireToolbar-action-mode:hover, [class*="squireToolbar-row"] [class*="squireToolbar-action-"]:active, [class*="squireToolbar-row"] [class*="squireToolbar-action-"]:hover {
   background: navy !important; }
@@ -208,6 +315,9 @@ body {
 [class*="block-info-"] {
   color: #e6eaf0; }
 
+[class*="block-info"] {
+  background-color: #0000a9; }
+
 .fill-global-grey {
   fill: #ffed00; }
 
@@ -220,8 +330,14 @@ body {
 .item-container, .item-container-row, .contactsummary-container {
   background: #000076; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active),
-.conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .squireToolbar-container {
+.items-column-list-inner, .ReactVirtualized__Grid__innerScrollContainer {
+  border-color: #0000a9; }
+  .items-column-list-inner .item-container, .items-column-list-inner .item-container-row, .ReactVirtualized__Grid__innerScrollContainer .item-container, .ReactVirtualized__Grid__innerScrollContainer .item-container-row {
+    border-color: #0000a9; }
+
+.item-container:not(.item-is-selected):not(.read):not(.active),
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active),
+.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .squireToolbar-container {
   background: #000090; }
 
 .item-container.active, .item-is-selected {
@@ -273,15 +389,16 @@ details:first-child {
 .message-infobox {
   background-color: #000076; }
 
-.bordered,
-.bordered-container:not([class*="composerInputMeta-"]),
-.breadcrumb-container {
-  border-color: #0000a9; }
-
 .message-content.frame.message-frame {
   background: white;
   color: black; }
 
+.angular-squire-iframe body {
+  color: #e6eaf0;
+  background: #000090; }
+  .angular-squire-iframe body a {
+    color: #ffed00; }
+
 .pm-button, .pm-button--info, .pm-button--redborder {
   background: #000076;
   border-color: #0000a9;
@@ -446,16 +563,23 @@ select.pm-field, select.pm-field-icon-container {
 .pm-plans-table-row--highlighted {
   background-color: #000076; }
 
+.pm-checkbox-fakecheck,
+.pm-radio-fakeradio {
+  border-color: #ffed00;
+  background: transparent; }
+
+[class*="icon-"].color-primary {
+  color: #ffed00; }
+
+.color-global-grey-dm {
+  color: #ffed00; }
+
 .calendar-grid-heading, .calendar-monthgrid-day {
   color: #e6eaf0; }
 
 .calendar-grid-heading[aria-current="date"] {
   color: white; }
 
-.pm-checkbox-fakecheck {
-  border-color: #ffed00;
-  background: transparent; }
-
 .calendar-daygrid-weeknumber {
   background-color: #000043; }
 
diff --git a/themes/dracula/dracula.css b/themes/dracula/dracula.css
index b03c5c4..1bf749d 100644
--- a/themes/dracula/dracula.css
+++ b/themes/dracula/dracula.css
@@ -1,6 +1,6 @@
 /*! =========================================== *
  * DRACULA Theme
- * Version: 4.0.0
+ * Version: v4.0.0-beta15
  * Author: Mike Barkmin
  * Website: www.barkmin.eu
  * Twitter: @mikebarkmin
@@ -45,6 +45,11 @@
   background-color: #000;
   color: #e6eaf0; }
 
+.searchbox-advanced-search-button:active,
+.searchbox-advanced-search-button:focus,
+.searchbox-advanced-search-button:hover {
+  background-color: #282a36; }
+
 .topnav-link, .topnav-link > .topnav-icon {
   color: #D8D8D8;
   transition: color .2s ease-in-out; }
@@ -57,35 +62,50 @@
 .topnav-link:hover > .topnav-icon, .topnav-link[aria-current=true] > .topnav-icon {
   color: #FF79C6; }
 
+.protonmail .text-purple {
+  color: #282a36 !important; }
+
+.protonmail .text-purple:hover {
+  color: #ff46b0 !important; }
+
+#pm_composer .composer .composerHeader-container,
+.composerInputMeta-overlay .composerHeader-container {
+  background: #333545; }
+
 .conversation.marked::before {
   background: #FF79C6; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
   background: #fff; }
 
-.conversation.item-container.selected, .conversation.item-container-row.selected {
+.item-container.selected, .item-container-row.selected,
+.item-container.active, .item-is-selected {
   background: rgba(255, 121, 198, 0.1); }
 
-.conversation .item-checkbox:checked + .item-icon {
-  background-color: #FF79C6;
-  border-color: #FF79C6; }
-
-.conversation .item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #FF79C6; }
-
-.conversation .item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #D8D8D8; }
-
-.conversation .selectBoxElement-container:hover .item-icon {
+.selectBoxElement-container:hover .item-icon {
   background-color: transparent;
   border: 1px solid #ff60bb; }
-  .conversation .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
+  .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
     fill: #ff60bb; }
 
-.conversation .selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+.selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
   background-color: #ff60bb;
   border-color: #ff60bb; }
 
+.item-checkbox:checked + .item-icon {
+  background-color: #FF79C6;
+  border-color: #FF79C6; }
+
+.item-checkbox + .item-icon:hover {
+  background-color: #ff60bb;
+  border-color: #ff60bb; }
+
+.item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #D8D8D8; }
+
+.item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #D8D8D8; }
+
 .starbutton {
   fill: #FF79C6 !important;
   opacity: 0.7; }
@@ -132,10 +152,36 @@ a:active, a:focus, a:hover,
   background: #ff60bb;
   border: 1px solid #ff60bb; }
 
+.is-active.pm-button--error, .is-active.pm-button--error.pm-button--info, .is-active.pm-button--error.pm-button--redborder, .is-active.pm-button--primary, .is-active.pm-button--primary.pm-button--info, .is-active.pm-button--primary.pm-button--redborder, .is-active.pm-button--warning, .is-active.pm-button--warning.pm-button--info, .is-active.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info:not(div):active, .pm-button--error.pm-button--redborder:not(div):active, .pm-button--error:not(div):active, .pm-button--primary.pm-button--info:not(div):active, .pm-button--primary.pm-button--redborder:not(div):active, .pm-button--primary:not(div):active, .pm-button--warning.pm-button--info:not(div):active, .pm-button--warning.pm-button--redborder:not(div):active, .pm-button--warning:not(div):active, .pm-button-blue.is-active, .pm-button-blue.is-active.pm-button--info, .pm-button-blue.is-active.pm-button--redborder, .pm-button-blue.pm-button--info:not(div):active, .pm-button-blue.pm-button--redborder:not(div):active, .pm-button-blue:not(div):active, .pm-button.is-active.pm-button--error, .pm-button.is-active.pm-button--primary, .pm-button.is-active.pm-button--warning, .pm-button.pm-button--error:not(div):active, .pm-button.pm-button--primary:not(div):active, .pm-button.pm-button--warning:not(div):active, .pm-button.pm-button-blue.is-active, .pm-button.pm-button-blue:not(div):active {
+  background: #ff46b0;
+  border-color: #ff46b0; }
+
+.pm-button-blueborder {
+  box-shadow: none;
+  border-color: #282a36;
+  color: #282a36;
+  transition: color .2s ease-in-out, border-color .2s ease-in-out; }
+
+.pm-button-blueborder:hover {
+  box-shadow: none;
+  border-color: #ff46b0;
+  color: #ff46b0; }
+
+.is-active.pm-button--primaryborder,
+.pm-button--primaryborder:not(div):active,
+.pm-button-blueborder.is-active,
+.pm-button-blueborder:not(div):active {
+  border-color: #ff46b0;
+  color: #ff46b0;
+  background: transparent; }
+
 .pm-toggle-checkbox:checked + .pm-toggle-label:before {
   background: #FF79C6;
   border-color: #FF79C6; }
 
+.angular-squire-iframe body a {
+  color: #FF79C6; }
+
 .fill-pm-blue,
 .message-attachmentIcon .file-outer-icon.is-embedded {
   fill: #FF79C6; }
@@ -154,6 +200,25 @@ a:active, a:focus, a:hover,
 .pm-simple-table-row-th .fill-primary {
   fill: #FF79C6; }
 
+.pm-checkbox-fakecheck, .pm-radio-fakeradio {
+  border-color: #282a36; }
+  .pm-checkbox-fakecheck [class*="icon-"], .pm-radio-fakeradio [class*="icon-"] {
+    fill: #282a36; }
+
+[class*="icon-"].color-primary {
+  color: #282a36; }
+  [class*="icon-"].color-primary:hover {
+    color: #ff46b0; }
+
+.badgeLabel, .badgeLabel-primary {
+  border-color: #ff46b0; }
+
+.badgeLabel,
+.badgeLabel-blue,
+.badgeLabel-primary,
+.bg-pm-blue {
+  background-color: #ff46b0; }
+
 .progress-contact {
   color: #FF79C6; }
   .progress-contact::-moz-progress-bar {
@@ -164,4 +229,7 @@ a:active, a:focus, a:hover,
 .minicalendar-day[aria-pressed="true"],
 .minicalendar-day[aria-current="date"]::before,
 .calendar-monthgrid-day[aria-pressed="true"] .calendar-monthgrid-day-number {
-  background: #f9008f; }
+  background: #ff2da5; }
+
+.minicalendar-day[aria-current="date"][aria-pressed="true"]::before {
+  background: #FF79C6; }
diff --git a/themes/dracula/dracula_full.css b/themes/dracula/dracula_full.css
index ddff31a..eee9933 100644
--- a/themes/dracula/dracula_full.css
+++ b/themes/dracula/dracula_full.css
@@ -1,6 +1,6 @@
 /*! =========================================== *
  * DRACULA Theme
- * Version: 4.0.0
+ * Version: v4.0.0-beta15
  * Author: Mike Barkmin
  * Website: www.barkmin.eu
  * Twitter: @mikebarkmin
@@ -45,6 +45,11 @@
   background-color: #000;
   color: #e6eaf0; }
 
+.searchbox-advanced-search-button:active,
+.searchbox-advanced-search-button:focus,
+.searchbox-advanced-search-button:hover {
+  background-color: #282a36; }
+
 .topnav-link, .topnav-link > .topnav-icon {
   color: #D8D8D8;
   transition: color .2s ease-in-out; }
@@ -57,35 +62,50 @@
 .topnav-link:hover > .topnav-icon, .topnav-link[aria-current=true] > .topnav-icon {
   color: #FF79C6; }
 
+.protonmail .text-purple {
+  color: #282a36 !important; }
+
+.protonmail .text-purple:hover {
+  color: #ff46b0 !important; }
+
+#pm_composer .composer .composerHeader-container,
+.composerInputMeta-overlay .composerHeader-container {
+  background: #333545; }
+
 .conversation.marked::before {
   background: #FF79C6; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
   background: #fff; }
 
-.conversation.item-container.selected, .conversation.item-container-row.selected {
+.item-container.selected, .item-container-row.selected,
+.item-container.active, .item-is-selected {
   background: rgba(255, 121, 198, 0.1); }
 
-.conversation .item-checkbox:checked + .item-icon {
-  background-color: #FF79C6;
-  border-color: #FF79C6; }
-
-.conversation .item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #FF79C6; }
-
-.conversation .item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #D8D8D8; }
-
-.conversation .selectBoxElement-container:hover .item-icon {
+.selectBoxElement-container:hover .item-icon {
   background-color: transparent;
   border: 1px solid #ff60bb; }
-  .conversation .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
+  .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
     fill: #ff60bb; }
 
-.conversation .selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+.selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+  background-color: #ff60bb;
+  border-color: #ff60bb; }
+
+.item-checkbox:checked + .item-icon {
+  background-color: #FF79C6;
+  border-color: #FF79C6; }
+
+.item-checkbox + .item-icon:hover {
   background-color: #ff60bb;
   border-color: #ff60bb; }
 
+.item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #D8D8D8; }
+
+.item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #D8D8D8; }
+
 .starbutton {
   fill: #FF79C6 !important;
   opacity: 0.7; }
@@ -132,10 +152,36 @@ a:active, a:focus, a:hover,
   background: #ff60bb;
   border: 1px solid #ff60bb; }
 
+.is-active.pm-button--error, .is-active.pm-button--error.pm-button--info, .is-active.pm-button--error.pm-button--redborder, .is-active.pm-button--primary, .is-active.pm-button--primary.pm-button--info, .is-active.pm-button--primary.pm-button--redborder, .is-active.pm-button--warning, .is-active.pm-button--warning.pm-button--info, .is-active.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info:not(div):active, .pm-button--error.pm-button--redborder:not(div):active, .pm-button--error:not(div):active, .pm-button--primary.pm-button--info:not(div):active, .pm-button--primary.pm-button--redborder:not(div):active, .pm-button--primary:not(div):active, .pm-button--warning.pm-button--info:not(div):active, .pm-button--warning.pm-button--redborder:not(div):active, .pm-button--warning:not(div):active, .pm-button-blue.is-active, .pm-button-blue.is-active.pm-button--info, .pm-button-blue.is-active.pm-button--redborder, .pm-button-blue.pm-button--info:not(div):active, .pm-button-blue.pm-button--redborder:not(div):active, .pm-button-blue:not(div):active, .pm-button.is-active.pm-button--error, .pm-button.is-active.pm-button--primary, .pm-button.is-active.pm-button--warning, .pm-button.pm-button--error:not(div):active, .pm-button.pm-button--primary:not(div):active, .pm-button.pm-button--warning:not(div):active, .pm-button.pm-button-blue.is-active, .pm-button.pm-button-blue:not(div):active {
+  background: #ff46b0;
+  border-color: #ff46b0; }
+
+.pm-button-blueborder {
+  box-shadow: none;
+  border-color: #282a36;
+  color: #282a36;
+  transition: color .2s ease-in-out, border-color .2s ease-in-out; }
+
+.pm-button-blueborder:hover {
+  box-shadow: none;
+  border-color: #ff46b0;
+  color: #ff46b0; }
+
+.is-active.pm-button--primaryborder,
+.pm-button--primaryborder:not(div):active,
+.pm-button-blueborder.is-active,
+.pm-button-blueborder:not(div):active {
+  border-color: #ff46b0;
+  color: #ff46b0;
+  background: transparent; }
+
 .pm-toggle-checkbox:checked + .pm-toggle-label:before {
   background: #FF79C6;
   border-color: #FF79C6; }
 
+.angular-squire-iframe body a {
+  color: #FF79C6; }
+
 .fill-pm-blue,
 .message-attachmentIcon .file-outer-icon.is-embedded {
   fill: #FF79C6; }
@@ -154,6 +200,25 @@ a:active, a:focus, a:hover,
 .pm-simple-table-row-th .fill-primary {
   fill: #FF79C6; }
 
+.pm-checkbox-fakecheck, .pm-radio-fakeradio {
+  border-color: #282a36; }
+  .pm-checkbox-fakecheck [class*="icon-"], .pm-radio-fakeradio [class*="icon-"] {
+    fill: #282a36; }
+
+[class*="icon-"].color-primary {
+  color: #282a36; }
+  [class*="icon-"].color-primary:hover {
+    color: #ff46b0; }
+
+.badgeLabel, .badgeLabel-primary {
+  border-color: #ff46b0; }
+
+.badgeLabel,
+.badgeLabel-blue,
+.badgeLabel-primary,
+.bg-pm-blue {
+  background-color: #ff46b0; }
+
 .progress-contact {
   color: #FF79C6; }
   .progress-contact::-moz-progress-bar {
@@ -164,7 +229,10 @@ a:active, a:focus, a:hover,
 .minicalendar-day[aria-pressed="true"],
 .minicalendar-day[aria-current="date"]::before,
 .calendar-monthgrid-day[aria-pressed="true"] .calendar-monthgrid-day-number {
-  background: #f9008f; }
+  background: #ff2da5; }
+
+.minicalendar-day[aria-current="date"][aria-pressed="true"]::before {
+  background: #FF79C6; }
 
 body {
   scrollbar-color: #3e4153 #2c2f3c; }
@@ -178,12 +246,51 @@ body {
     box-shadow: inset 0 0 0 4px #2c2f3c;
     border-radius: 16px; }
 
+.bordered,
+.bordered-container:not([class*="composerInputMeta-"]),
+.breadcrumb-container {
+  border-color: #3e4153; }
+
+.squireToolbar-select-list {
+  background: #282a36;
+  color: #e6eaf0; }
+
+.squireToolbar-dropdown-divider {
+  background-color: #3e4153; }
+
+.squireToolbar-select-item:hover {
+  background: #242530; }
+
 #pm_composer .composer,
 .composerInputMeta-overlay {
   background: #282a36; }
-  #pm_composer .composer .composerHeader-container,
-  .composerInputMeta-overlay .composerHeader-container {
-    background: #333545; }
+
+.autocompleteEmails-item {
+  background-color: #242530;
+  border-color: #242530; }
+
+.autocompleteEmails-label {
+  border-left: 1px solid #3e4153;
+  border-right: 1px solid #3e4153; }
+
+.composerOptions-container.show {
+  background: #242530; }
+  .composerOptions-container.show .shadow-container {
+    background: #282a36;
+    color: #e6eaf0; }
+
+.is-disabled.pm-button--error, .is-disabled.pm-button--error.pm-button--info, .is-disabled.pm-button--error.pm-button--redborder, .is-disabled.pm-button--primary, .is-disabled.pm-button--primary.pm-button--info, .is-disabled.pm-button--primary.pm-button--redborder, .is-disabled.pm-button--warning, .is-disabled.pm-button--warning.pm-button--info, .is-disabled.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info[disabled], .pm-button--error.pm-button--redborder[disabled], .pm-button--error[disabled], .pm-button--primary.pm-button--info[disabled], .pm-button--primary.pm-button--redborder[disabled], .pm-button--primary[disabled], .pm-button--warning.pm-button--info[disabled], .pm-button--warning.pm-button--redborder[disabled], .pm-button--warning[disabled], .pm-button-blue.is-disabled, .pm-button-blue.is-disabled.pm-button--info, .pm-button-blue.is-disabled.pm-button--redborder, .pm-button-blue.pm-button--info[disabled], .pm-button-blue.pm-button--redborder[disabled], .pm-button-blue[disabled], .pm-button.is-disabled.pm-button--error, .pm-button.is-disabled.pm-button--primary, .pm-button.is-disabled.pm-button--warning, .pm-button.pm-button--error[disabled], .pm-button.pm-button--primary[disabled], .pm-button.pm-button--warning[disabled], .pm-button.pm-button-blue.is-disabled, .pm-button.pm-button-blue[disabled] {
+  background-color: #242530;
+  border-color: #3e4153;
+  color: #121319; }
+
+.pm-button-blueborder {
+  border-color: #FF79C6;
+  color: #FF79C6; }
+
+.pm-button-blueborder:hover {
+  border-color: #ff93d1;
+  color: #ff93d1; }
 
 [class*="squireToolbar-row"] .squireToolbar-action-mode:active, [class*="squireToolbar-row"] .squireToolbar-action-mode:hover, [class*="squireToolbar-row"] [class*="squireToolbar-action-"]:active, [class*="squireToolbar-row"] [class*="squireToolbar-action-"]:hover {
   background: #2c2f3c !important; }
@@ -208,6 +315,9 @@ body {
 [class*="block-info-"] {
   color: #e6eaf0; }
 
+[class*="block-info"] {
+  background-color: #3e4153; }
+
 .fill-global-grey {
   fill: #FF79C6; }
 
@@ -220,8 +330,14 @@ body {
 .item-container, .item-container-row, .contactsummary-container {
   background: #282a36; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active),
-.conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .squireToolbar-container {
+.items-column-list-inner, .ReactVirtualized__Grid__innerScrollContainer {
+  border-color: #3e4153; }
+  .items-column-list-inner .item-container, .items-column-list-inner .item-container-row, .ReactVirtualized__Grid__innerScrollContainer .item-container, .ReactVirtualized__Grid__innerScrollContainer .item-container-row {
+    border-color: #3e4153; }
+
+.item-container:not(.item-is-selected):not(.read):not(.active),
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active),
+.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .squireToolbar-container {
   background: #333545; }
 
 .item-container.active, .item-is-selected {
@@ -273,15 +389,16 @@ details:first-child {
 .message-infobox {
   background-color: #282a36; }
 
-.bordered,
-.bordered-container:not([class*="composerInputMeta-"]),
-.breadcrumb-container {
-  border-color: #3e4153; }
-
 .message-content.frame.message-frame {
   background: white;
   color: black; }
 
+.angular-squire-iframe body {
+  color: #e6eaf0;
+  background: #333545; }
+  .angular-squire-iframe body a {
+    color: #FF79C6; }
+
 .pm-button, .pm-button--info, .pm-button--redborder {
   background: #282a36;
   border-color: #3e4153;
@@ -446,16 +563,23 @@ select.pm-field, select.pm-field-icon-container {
 .pm-plans-table-row--highlighted {
   background-color: #282a36; }
 
+.pm-checkbox-fakecheck,
+.pm-radio-fakeradio {
+  border-color: #FF79C6;
+  background: transparent; }
+
+[class*="icon-"].color-primary {
+  color: #FF79C6; }
+
+.color-global-grey-dm {
+  color: #FF79C6; }
+
 .calendar-grid-heading, .calendar-monthgrid-day {
   color: #e6eaf0; }
 
 .calendar-grid-heading[aria-current="date"] {
   color: white; }
 
-.pm-checkbox-fakecheck {
-  border-color: #FF79C6;
-  background: transparent; }
-
 .calendar-daygrid-weeknumber {
   background-color: #121319; }
 
diff --git a/themes/green_lume/green_lume.css b/themes/green_lume/green_lume.css
index 6e8f2c5..a350935 100644
--- a/themes/green_lume/green_lume.css
+++ b/themes/green_lume/green_lume.css
@@ -1,6 +1,6 @@
 /*! =========================================== *
  * GREEN LUME THEME
- * Version: 4.0.0
+ * Version: v4.0.0-beta15
  * Author: Cristiano Almeida
  * Website: www.csalmeida.com
  * Tweets @_csalmeida
@@ -45,6 +45,11 @@
   background-color: #000;
   color: #d6d6d6; }
 
+.searchbox-advanced-search-button:active,
+.searchbox-advanced-search-button:focus,
+.searchbox-advanced-search-button:hover {
+  background-color: #1C1C1C; }
+
 .topnav-link, .topnav-link > .topnav-icon {
   color: #fff;
   transition: color .2s ease-in-out; }
@@ -57,35 +62,50 @@
 .topnav-link:hover > .topnav-icon, .topnav-link[aria-current=true] > .topnav-icon {
   color: #2FBF71; }
 
+.protonmail .text-purple {
+  color: #1C1C1C !important; }
+
+.protonmail .text-purple:hover {
+  color: #259659 !important; }
+
+#pm_composer .composer .composerHeader-container,
+.composerInputMeta-overlay .composerHeader-container {
+  background: #292929; }
+
 .conversation.marked::before {
   background: #2FBF71; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
   background: #fff; }
 
-.conversation.item-container.selected, .conversation.item-container-row.selected {
+.item-container.selected, .item-container-row.selected,
+.item-container.active, .item-is-selected {
   background: rgba(47, 191, 113, 0.1); }
 
-.conversation .item-checkbox:checked + .item-icon {
-  background-color: #2FBF71;
-  border-color: #2FBF71; }
-
-.conversation .item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #2FBF71; }
-
-.conversation .item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #fff; }
-
-.conversation .selectBoxElement-container:hover .item-icon {
+.selectBoxElement-container:hover .item-icon {
   background-color: transparent;
   border: 1px solid #2aab65; }
-  .conversation .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
+  .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
     fill: #2aab65; }
 
-.conversation .selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+.selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
   background-color: #2aab65;
   border-color: #2aab65; }
 
+.item-checkbox:checked + .item-icon {
+  background-color: #2FBF71;
+  border-color: #2FBF71; }
+
+.item-checkbox + .item-icon:hover {
+  background-color: #2aab65;
+  border-color: #2aab65; }
+
+.item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #fff; }
+
+.item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #fff; }
+
 .starbutton {
   fill: #2FBF71 !important;
   opacity: 0.7; }
@@ -132,10 +152,36 @@ a:active, a:focus, a:hover,
   background: #2aab65;
   border: 1px solid #2aab65; }
 
+.is-active.pm-button--error, .is-active.pm-button--error.pm-button--info, .is-active.pm-button--error.pm-button--redborder, .is-active.pm-button--primary, .is-active.pm-button--primary.pm-button--info, .is-active.pm-button--primary.pm-button--redborder, .is-active.pm-button--warning, .is-active.pm-button--warning.pm-button--info, .is-active.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info:not(div):active, .pm-button--error.pm-button--redborder:not(div):active, .pm-button--error:not(div):active, .pm-button--primary.pm-button--info:not(div):active, .pm-button--primary.pm-button--redborder:not(div):active, .pm-button--primary:not(div):active, .pm-button--warning.pm-button--info:not(div):active, .pm-button--warning.pm-button--redborder:not(div):active, .pm-button--warning:not(div):active, .pm-button-blue.is-active, .pm-button-blue.is-active.pm-button--info, .pm-button-blue.is-active.pm-button--redborder, .pm-button-blue.pm-button--info:not(div):active, .pm-button-blue.pm-button--redborder:not(div):active, .pm-button-blue:not(div):active, .pm-button.is-active.pm-button--error, .pm-button.is-active.pm-button--primary, .pm-button.is-active.pm-button--warning, .pm-button.pm-button--error:not(div):active, .pm-button.pm-button--primary:not(div):active, .pm-button.pm-button--warning:not(div):active, .pm-button.pm-button-blue.is-active, .pm-button.pm-button-blue:not(div):active {
+  background: #259659;
+  border-color: #259659; }
+
+.pm-button-blueborder {
+  box-shadow: none;
+  border-color: #1C1C1C;
+  color: #1C1C1C;
+  transition: color .2s ease-in-out, border-color .2s ease-in-out; }
+
+.pm-button-blueborder:hover {
+  box-shadow: none;
+  border-color: #259659;
+  color: #259659; }
+
+.is-active.pm-button--primaryborder,
+.pm-button--primaryborder:not(div):active,
+.pm-button-blueborder.is-active,
+.pm-button-blueborder:not(div):active {
+  border-color: #259659;
+  color: #259659;
+  background: transparent; }
+
 .pm-toggle-checkbox:checked + .pm-toggle-label:before {
   background: #2FBF71;
   border-color: #2FBF71; }
 
+.angular-squire-iframe body a {
+  color: #2FBF71; }
+
 .fill-pm-blue,
 .message-attachmentIcon .file-outer-icon.is-embedded {
   fill: #2FBF71; }
@@ -154,6 +200,25 @@ a:active, a:focus, a:hover,
 .pm-simple-table-row-th .fill-primary {
   fill: #2FBF71; }
 
+.pm-checkbox-fakecheck, .pm-radio-fakeradio {
+  border-color: #1C1C1C; }
+  .pm-checkbox-fakecheck [class*="icon-"], .pm-radio-fakeradio [class*="icon-"] {
+    fill: #1C1C1C; }
+
+[class*="icon-"].color-primary {
+  color: #1C1C1C; }
+  [class*="icon-"].color-primary:hover {
+    color: #259659; }
+
+.badgeLabel, .badgeLabel-primary {
+  border-color: #259659; }
+
+.badgeLabel,
+.badgeLabel-blue,
+.badgeLabel-primary,
+.bg-pm-blue {
+  background-color: #259659; }
+
 .progress-contact {
   color: #2FBF71; }
   .progress-contact::-moz-progress-bar {
@@ -164,4 +229,7 @@ a:active, a:focus, a:hover,
 .minicalendar-day[aria-pressed="true"],
 .minicalendar-day[aria-current="date"]::before,
 .calendar-monthgrid-day[aria-pressed="true"] .calendar-monthgrid-day-number {
-  background: #165934; }
+  background: #20824d; }
+
+.minicalendar-day[aria-current="date"][aria-pressed="true"]::before {
+  background: #2FBF71; }
diff --git a/themes/green_lume/green_lume_full.css b/themes/green_lume/green_lume_full.css
index 84a8247..0823bf5 100644
--- a/themes/green_lume/green_lume_full.css
+++ b/themes/green_lume/green_lume_full.css
@@ -1,6 +1,6 @@
 /*! =========================================== *
  * GREEN LUME THEME
- * Version: 4.0.0
+ * Version: v4.0.0-beta15
  * Author: Cristiano Almeida
  * Website: www.csalmeida.com
  * Tweets @_csalmeida
@@ -45,6 +45,11 @@
   background-color: #000;
   color: #d6d6d6; }
 
+.searchbox-advanced-search-button:active,
+.searchbox-advanced-search-button:focus,
+.searchbox-advanced-search-button:hover {
+  background-color: #1C1C1C; }
+
 .topnav-link, .topnav-link > .topnav-icon {
   color: #fff;
   transition: color .2s ease-in-out; }
@@ -57,35 +62,50 @@
 .topnav-link:hover > .topnav-icon, .topnav-link[aria-current=true] > .topnav-icon {
   color: #2FBF71; }
 
+.protonmail .text-purple {
+  color: #1C1C1C !important; }
+
+.protonmail .text-purple:hover {
+  color: #259659 !important; }
+
+#pm_composer .composer .composerHeader-container,
+.composerInputMeta-overlay .composerHeader-container {
+  background: #292929; }
+
 .conversation.marked::before {
   background: #2FBF71; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
   background: #fff; }
 
-.conversation.item-container.selected, .conversation.item-container-row.selected {
+.item-container.selected, .item-container-row.selected,
+.item-container.active, .item-is-selected {
   background: rgba(47, 191, 113, 0.1); }
 
-.conversation .item-checkbox:checked + .item-icon {
-  background-color: #2FBF71;
-  border-color: #2FBF71; }
-
-.conversation .item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #2FBF71; }
-
-.conversation .item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #fff; }
-
-.conversation .selectBoxElement-container:hover .item-icon {
+.selectBoxElement-container:hover .item-icon {
   background-color: transparent;
   border: 1px solid #2aab65; }
-  .conversation .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
+  .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
     fill: #2aab65; }
 
-.conversation .selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+.selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+  background-color: #2aab65;
+  border-color: #2aab65; }
+
+.item-checkbox:checked + .item-icon {
+  background-color: #2FBF71;
+  border-color: #2FBF71; }
+
+.item-checkbox + .item-icon:hover {
   background-color: #2aab65;
   border-color: #2aab65; }
 
+.item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #fff; }
+
+.item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #fff; }
+
 .starbutton {
   fill: #2FBF71 !important;
   opacity: 0.7; }
@@ -132,10 +152,36 @@ a:active, a:focus, a:hover,
   background: #2aab65;
   border: 1px solid #2aab65; }
 
+.is-active.pm-button--error, .is-active.pm-button--error.pm-button--info, .is-active.pm-button--error.pm-button--redborder, .is-active.pm-button--primary, .is-active.pm-button--primary.pm-button--info, .is-active.pm-button--primary.pm-button--redborder, .is-active.pm-button--warning, .is-active.pm-button--warning.pm-button--info, .is-active.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info:not(div):active, .pm-button--error.pm-button--redborder:not(div):active, .pm-button--error:not(div):active, .pm-button--primary.pm-button--info:not(div):active, .pm-button--primary.pm-button--redborder:not(div):active, .pm-button--primary:not(div):active, .pm-button--warning.pm-button--info:not(div):active, .pm-button--warning.pm-button--redborder:not(div):active, .pm-button--warning:not(div):active, .pm-button-blue.is-active, .pm-button-blue.is-active.pm-button--info, .pm-button-blue.is-active.pm-button--redborder, .pm-button-blue.pm-button--info:not(div):active, .pm-button-blue.pm-button--redborder:not(div):active, .pm-button-blue:not(div):active, .pm-button.is-active.pm-button--error, .pm-button.is-active.pm-button--primary, .pm-button.is-active.pm-button--warning, .pm-button.pm-button--error:not(div):active, .pm-button.pm-button--primary:not(div):active, .pm-button.pm-button--warning:not(div):active, .pm-button.pm-button-blue.is-active, .pm-button.pm-button-blue:not(div):active {
+  background: #259659;
+  border-color: #259659; }
+
+.pm-button-blueborder {
+  box-shadow: none;
+  border-color: #1C1C1C;
+  color: #1C1C1C;
+  transition: color .2s ease-in-out, border-color .2s ease-in-out; }
+
+.pm-button-blueborder:hover {
+  box-shadow: none;
+  border-color: #259659;
+  color: #259659; }
+
+.is-active.pm-button--primaryborder,
+.pm-button--primaryborder:not(div):active,
+.pm-button-blueborder.is-active,
+.pm-button-blueborder:not(div):active {
+  border-color: #259659;
+  color: #259659;
+  background: transparent; }
+
 .pm-toggle-checkbox:checked + .pm-toggle-label:before {
   background: #2FBF71;
   border-color: #2FBF71; }
 
+.angular-squire-iframe body a {
+  color: #2FBF71; }
+
 .fill-pm-blue,
 .message-attachmentIcon .file-outer-icon.is-embedded {
   fill: #2FBF71; }
@@ -154,6 +200,25 @@ a:active, a:focus, a:hover,
 .pm-simple-table-row-th .fill-primary {
   fill: #2FBF71; }
 
+.pm-checkbox-fakecheck, .pm-radio-fakeradio {
+  border-color: #1C1C1C; }
+  .pm-checkbox-fakecheck [class*="icon-"], .pm-radio-fakeradio [class*="icon-"] {
+    fill: #1C1C1C; }
+
+[class*="icon-"].color-primary {
+  color: #1C1C1C; }
+  [class*="icon-"].color-primary:hover {
+    color: #259659; }
+
+.badgeLabel, .badgeLabel-primary {
+  border-color: #259659; }
+
+.badgeLabel,
+.badgeLabel-blue,
+.badgeLabel-primary,
+.bg-pm-blue {
+  background-color: #259659; }
+
 .progress-contact {
   color: #2FBF71; }
   .progress-contact::-moz-progress-bar {
@@ -164,7 +229,10 @@ a:active, a:focus, a:hover,
 .minicalendar-day[aria-pressed="true"],
 .minicalendar-day[aria-current="date"]::before,
 .calendar-monthgrid-day[aria-pressed="true"] .calendar-monthgrid-day-number {
-  background: #165934; }
+  background: #20824d; }
+
+.minicalendar-day[aria-current="date"][aria-pressed="true"]::before {
+  background: #2FBF71; }
 
 body {
   scrollbar-color: #363636 #212121; }
@@ -178,12 +246,51 @@ body {
     box-shadow: inset 0 0 0 4px #212121;
     border-radius: 16px; }
 
+.bordered,
+.bordered-container:not([class*="composerInputMeta-"]),
+.breadcrumb-container {
+  border-color: #363636; }
+
+.squireToolbar-select-list {
+  background: #1C1C1C;
+  color: #d6d6d6; }
+
+.squireToolbar-dropdown-divider {
+  background-color: #363636; }
+
+.squireToolbar-select-item:hover {
+  background: #171717; }
+
 #pm_composer .composer,
 .composerInputMeta-overlay {
   background: #1C1C1C; }
-  #pm_composer .composer .composerHeader-container,
-  .composerInputMeta-overlay .composerHeader-container {
-    background: #292929; }
+
+.autocompleteEmails-item {
+  background-color: #171717;
+  border-color: #171717; }
+
+.autocompleteEmails-label {
+  border-left: 1px solid #363636;
+  border-right: 1px solid #363636; }
+
+.composerOptions-container.show {
+  background: #171717; }
+  .composerOptions-container.show .shadow-container {
+    background: #1C1C1C;
+    color: #d6d6d6; }
+
+.is-disabled.pm-button--error, .is-disabled.pm-button--error.pm-button--info, .is-disabled.pm-button--error.pm-button--redborder, .is-disabled.pm-button--primary, .is-disabled.pm-button--primary.pm-button--info, .is-disabled.pm-button--primary.pm-button--redborder, .is-disabled.pm-button--warning, .is-disabled.pm-button--warning.pm-button--info, .is-disabled.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info[disabled], .pm-button--error.pm-button--redborder[disabled], .pm-button--error[disabled], .pm-button--primary.pm-button--info[disabled], .pm-button--primary.pm-button--redborder[disabled], .pm-button--primary[disabled], .pm-button--warning.pm-button--info[disabled], .pm-button--warning.pm-button--redborder[disabled], .pm-button--warning[disabled], .pm-button-blue.is-disabled, .pm-button-blue.is-disabled.pm-button--info, .pm-button-blue.is-disabled.pm-button--redborder, .pm-button-blue.pm-button--info[disabled], .pm-button-blue.pm-button--redborder[disabled], .pm-button-blue[disabled], .pm-button.is-disabled.pm-button--error, .pm-button.is-disabled.pm-button--primary, .pm-button.is-disabled.pm-button--warning, .pm-button.pm-button--error[disabled], .pm-button.pm-button--primary[disabled], .pm-button.pm-button--warning[disabled], .pm-button.pm-button-blue.is-disabled, .pm-button.pm-button-blue[disabled] {
+  background-color: #171717;
+  border-color: #363636;
+  color: #030303; }
+
+.pm-button-blueborder {
+  border-color: #2FBF71;
+  color: #2FBF71; }
+
+.pm-button-blueborder:hover {
+  border-color: #39ce7e;
+  color: #39ce7e; }
 
 [class*="squireToolbar-row"] .squireToolbar-action-mode:active, [class*="squireToolbar-row"] .squireToolbar-action-mode:hover, [class*="squireToolbar-row"] [class*="squireToolbar-action-"]:active, [class*="squireToolbar-row"] [class*="squireToolbar-action-"]:hover {
   background: #212121 !important; }
@@ -208,6 +315,9 @@ body {
 [class*="block-info-"] {
   color: #d6d6d6; }
 
+[class*="block-info"] {
+  background-color: #363636; }
+
 .fill-global-grey {
   fill: #2FBF71; }
 
@@ -220,8 +330,14 @@ body {
 .item-container, .item-container-row, .contactsummary-container {
   background: #1C1C1C; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active),
-.conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .squireToolbar-container {
+.items-column-list-inner, .ReactVirtualized__Grid__innerScrollContainer {
+  border-color: #363636; }
+  .items-column-list-inner .item-container, .items-column-list-inner .item-container-row, .ReactVirtualized__Grid__innerScrollContainer .item-container, .ReactVirtualized__Grid__innerScrollContainer .item-container-row {
+    border-color: #363636; }
+
+.item-container:not(.item-is-selected):not(.read):not(.active),
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active),
+.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .squireToolbar-container {
   background: #292929; }
 
 .item-container.active, .item-is-selected {
@@ -273,15 +389,16 @@ details:first-child {
 .message-infobox {
   background-color: #1C1C1C; }
 
-.bordered,
-.bordered-container:not([class*="composerInputMeta-"]),
-.breadcrumb-container {
-  border-color: #363636; }
-
 .message-content.frame.message-frame {
   background: white;
   color: black; }
 
+.angular-squire-iframe body {
+  color: #d6d6d6;
+  background: #292929; }
+  .angular-squire-iframe body a {
+    color: #2FBF71; }
+
 .pm-button, .pm-button--info, .pm-button--redborder {
   background: #1C1C1C;
   border-color: #363636;
@@ -446,16 +563,23 @@ select.pm-field, select.pm-field-icon-container {
 .pm-plans-table-row--highlighted {
   background-color: #1C1C1C; }
 
+.pm-checkbox-fakecheck,
+.pm-radio-fakeradio {
+  border-color: #2FBF71;
+  background: transparent; }
+
+[class*="icon-"].color-primary {
+  color: #2FBF71; }
+
+.color-global-grey-dm {
+  color: #2FBF71; }
+
 .calendar-grid-heading, .calendar-monthgrid-day {
   color: #d6d6d6; }
 
 .calendar-grid-heading[aria-current="date"] {
   color: white; }
 
-.pm-checkbox-fakecheck {
-  border-color: #2FBF71;
-  background: transparent; }
-
 .calendar-daygrid-weeknumber {
   background-color: #030303; }
 
diff --git a/themes/gruvbox/gruvbox.css b/themes/gruvbox/gruvbox.css
index 7454098..b99deba 100644
--- a/themes/gruvbox/gruvbox.css
+++ b/themes/gruvbox/gruvbox.css
@@ -1,7 +1,7 @@
 @charset "UTF-8";
 /*! =========================================== *
  * GRUVBOX THEME
- * Version: 4.0.0
+ * Version: v4.0.0-beta15
  * Author: AntoineÐ 
  * Website: www.antoined.fr
  * Mastodon: @[email protected]
@@ -47,6 +47,11 @@
   background-color: #32302f;
   color: #fbf1c7; }
 
+.searchbox-advanced-search-button:active,
+.searchbox-advanced-search-button:focus,
+.searchbox-advanced-search-button:hover {
+  background-color: #282828; }
+
 .topnav-link, .topnav-link > .topnav-icon {
   color: #fbf1c7;
   transition: color .2s ease-in-out; }
@@ -59,35 +64,50 @@
 .topnav-link:hover > .topnav-icon, .topnav-link[aria-current=true] > .topnav-icon {
   color: #689d6a; }
 
+.protonmail .text-purple {
+  color: #282828 !important; }
+
+.protonmail .text-purple:hover {
+  color: #537f54 !important; }
+
+#pm_composer .composer .composerHeader-container,
+.composerInputMeta-overlay .composerHeader-container {
+  background: #353535; }
+
 .conversation.marked::before {
   background: #689d6a; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
   background: #fff; }
 
-.conversation.item-container.selected, .conversation.item-container-row.selected {
+.item-container.selected, .item-container-row.selected,
+.item-container.active, .item-is-selected {
   background: rgba(104, 157, 106, 0.1); }
 
-.conversation .item-checkbox:checked + .item-icon {
-  background-color: #689d6a;
-  border-color: #689d6a; }
-
-.conversation .item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #689d6a; }
-
-.conversation .item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #fbf1c7; }
-
-.conversation .selectBoxElement-container:hover .item-icon {
+.selectBoxElement-container:hover .item-icon {
   background-color: transparent;
   border: 1px solid #5d8f5f; }
-  .conversation .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
+  .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
     fill: #5d8f5f; }
 
-.conversation .selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+.selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
   background-color: #5d8f5f;
   border-color: #5d8f5f; }
 
+.item-checkbox:checked + .item-icon {
+  background-color: #689d6a;
+  border-color: #689d6a; }
+
+.item-checkbox + .item-icon:hover {
+  background-color: #5d8f5f;
+  border-color: #5d8f5f; }
+
+.item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #fbf1c7; }
+
+.item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #fbf1c7; }
+
 .starbutton {
   fill: #689d6a !important;
   opacity: 0.7; }
@@ -134,10 +154,36 @@ a:active, a:focus, a:hover,
   background: #5d8f5f;
   border: 1px solid #5d8f5f; }
 
+.is-active.pm-button--error, .is-active.pm-button--error.pm-button--info, .is-active.pm-button--error.pm-button--redborder, .is-active.pm-button--primary, .is-active.pm-button--primary.pm-button--info, .is-active.pm-button--primary.pm-button--redborder, .is-active.pm-button--warning, .is-active.pm-button--warning.pm-button--info, .is-active.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info:not(div):active, .pm-button--error.pm-button--redborder:not(div):active, .pm-button--error:not(div):active, .pm-button--primary.pm-button--info:not(div):active, .pm-button--primary.pm-button--redborder:not(div):active, .pm-button--primary:not(div):active, .pm-button--warning.pm-button--info:not(div):active, .pm-button--warning.pm-button--redborder:not(div):active, .pm-button--warning:not(div):active, .pm-button-blue.is-active, .pm-button-blue.is-active.pm-button--info, .pm-button-blue.is-active.pm-button--redborder, .pm-button-blue.pm-button--info:not(div):active, .pm-button-blue.pm-button--redborder:not(div):active, .pm-button-blue:not(div):active, .pm-button.is-active.pm-button--error, .pm-button.is-active.pm-button--primary, .pm-button.is-active.pm-button--warning, .pm-button.pm-button--error:not(div):active, .pm-button.pm-button--primary:not(div):active, .pm-button.pm-button--warning:not(div):active, .pm-button.pm-button-blue.is-active, .pm-button.pm-button-blue:not(div):active {
+  background: #537f54;
+  border-color: #537f54; }
+
+.pm-button-blueborder {
+  box-shadow: none;
+  border-color: #282828;
+  color: #282828;
+  transition: color .2s ease-in-out, border-color .2s ease-in-out; }
+
+.pm-button-blueborder:hover {
+  box-shadow: none;
+  border-color: #537f54;
+  color: #537f54; }
+
+.is-active.pm-button--primaryborder,
+.pm-button--primaryborder:not(div):active,
+.pm-button-blueborder.is-active,
+.pm-button-blueborder:not(div):active {
+  border-color: #537f54;
+  color: #537f54;
+  background: transparent; }
+
 .pm-toggle-checkbox:checked + .pm-toggle-label:before {
   background: #689d6a;
   border-color: #689d6a; }
 
+.angular-squire-iframe body a {
+  color: #689d6a; }
+
 .fill-pm-blue,
 .message-attachmentIcon .file-outer-icon.is-embedded {
   fill: #689d6a; }
@@ -156,6 +202,25 @@ a:active, a:focus, a:hover,
 .pm-simple-table-row-th .fill-primary {
   fill: #689d6a; }
 
+.pm-checkbox-fakecheck, .pm-radio-fakeradio {
+  border-color: #282828; }
+  .pm-checkbox-fakecheck [class*="icon-"], .pm-radio-fakeradio [class*="icon-"] {
+    fill: #282828; }
+
+[class*="icon-"].color-primary {
+  color: #282828; }
+  [class*="icon-"].color-primary:hover {
+    color: #537f54; }
+
+.badgeLabel, .badgeLabel-primary {
+  border-color: #537f54; }
+
+.badgeLabel,
+.badgeLabel-blue,
+.badgeLabel-primary,
+.bg-pm-blue {
+  background-color: #537f54; }
+
 .progress-contact {
   color: #689d6a; }
   .progress-contact::-moz-progress-bar {
@@ -166,4 +231,7 @@ a:active, a:focus, a:hover,
 .minicalendar-day[aria-pressed="true"],
 .minicalendar-day[aria-current="date"]::before,
 .calendar-monthgrid-day[aria-pressed="true"] .calendar-monthgrid-day-number {
-  background: #355136; }
+  background: #49704a; }
+
+.minicalendar-day[aria-current="date"][aria-pressed="true"]::before {
+  background: #689d6a; }
diff --git a/themes/gruvbox/gruvbox_full.css b/themes/gruvbox/gruvbox_full.css
index c8296db..deefb8f 100644
--- a/themes/gruvbox/gruvbox_full.css
+++ b/themes/gruvbox/gruvbox_full.css
@@ -1,7 +1,7 @@
 @charset "UTF-8";
 /*! =========================================== *
  * GRUVBOX THEME
- * Version: 4.0.0
+ * Version: v4.0.0-beta15
  * Author: AntoineÐ 
  * Website: www.antoined.fr
  * Mastodon: @[email protected]
@@ -47,6 +47,11 @@
   background-color: #32302f;
   color: #fbf1c7; }
 
+.searchbox-advanced-search-button:active,
+.searchbox-advanced-search-button:focus,
+.searchbox-advanced-search-button:hover {
+  background-color: #282828; }
+
 .topnav-link, .topnav-link > .topnav-icon {
   color: #fbf1c7;
   transition: color .2s ease-in-out; }
@@ -59,35 +64,50 @@
 .topnav-link:hover > .topnav-icon, .topnav-link[aria-current=true] > .topnav-icon {
   color: #689d6a; }
 
+.protonmail .text-purple {
+  color: #282828 !important; }
+
+.protonmail .text-purple:hover {
+  color: #537f54 !important; }
+
+#pm_composer .composer .composerHeader-container,
+.composerInputMeta-overlay .composerHeader-container {
+  background: #353535; }
+
 .conversation.marked::before {
   background: #689d6a; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
   background: #fff; }
 
-.conversation.item-container.selected, .conversation.item-container-row.selected {
+.item-container.selected, .item-container-row.selected,
+.item-container.active, .item-is-selected {
   background: rgba(104, 157, 106, 0.1); }
 
-.conversation .item-checkbox:checked + .item-icon {
-  background-color: #689d6a;
-  border-color: #689d6a; }
-
-.conversation .item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #689d6a; }
-
-.conversation .item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #fbf1c7; }
-
-.conversation .selectBoxElement-container:hover .item-icon {
+.selectBoxElement-container:hover .item-icon {
   background-color: transparent;
   border: 1px solid #5d8f5f; }
-  .conversation .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
+  .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
     fill: #5d8f5f; }
 
-.conversation .selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+.selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+  background-color: #5d8f5f;
+  border-color: #5d8f5f; }
+
+.item-checkbox:checked + .item-icon {
+  background-color: #689d6a;
+  border-color: #689d6a; }
+
+.item-checkbox + .item-icon:hover {
   background-color: #5d8f5f;
   border-color: #5d8f5f; }
 
+.item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #fbf1c7; }
+
+.item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #fbf1c7; }
+
 .starbutton {
   fill: #689d6a !important;
   opacity: 0.7; }
@@ -134,10 +154,36 @@ a:active, a:focus, a:hover,
   background: #5d8f5f;
   border: 1px solid #5d8f5f; }
 
+.is-active.pm-button--error, .is-active.pm-button--error.pm-button--info, .is-active.pm-button--error.pm-button--redborder, .is-active.pm-button--primary, .is-active.pm-button--primary.pm-button--info, .is-active.pm-button--primary.pm-button--redborder, .is-active.pm-button--warning, .is-active.pm-button--warning.pm-button--info, .is-active.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info:not(div):active, .pm-button--error.pm-button--redborder:not(div):active, .pm-button--error:not(div):active, .pm-button--primary.pm-button--info:not(div):active, .pm-button--primary.pm-button--redborder:not(div):active, .pm-button--primary:not(div):active, .pm-button--warning.pm-button--info:not(div):active, .pm-button--warning.pm-button--redborder:not(div):active, .pm-button--warning:not(div):active, .pm-button-blue.is-active, .pm-button-blue.is-active.pm-button--info, .pm-button-blue.is-active.pm-button--redborder, .pm-button-blue.pm-button--info:not(div):active, .pm-button-blue.pm-button--redborder:not(div):active, .pm-button-blue:not(div):active, .pm-button.is-active.pm-button--error, .pm-button.is-active.pm-button--primary, .pm-button.is-active.pm-button--warning, .pm-button.pm-button--error:not(div):active, .pm-button.pm-button--primary:not(div):active, .pm-button.pm-button--warning:not(div):active, .pm-button.pm-button-blue.is-active, .pm-button.pm-button-blue:not(div):active {
+  background: #537f54;
+  border-color: #537f54; }
+
+.pm-button-blueborder {
+  box-shadow: none;
+  border-color: #282828;
+  color: #282828;
+  transition: color .2s ease-in-out, border-color .2s ease-in-out; }
+
+.pm-button-blueborder:hover {
+  box-shadow: none;
+  border-color: #537f54;
+  color: #537f54; }
+
+.is-active.pm-button--primaryborder,
+.pm-button--primaryborder:not(div):active,
+.pm-button-blueborder.is-active,
+.pm-button-blueborder:not(div):active {
+  border-color: #537f54;
+  color: #537f54;
+  background: transparent; }
+
 .pm-toggle-checkbox:checked + .pm-toggle-label:before {
   background: #689d6a;
   border-color: #689d6a; }
 
+.angular-squire-iframe body a {
+  color: #689d6a; }
+
 .fill-pm-blue,
 .message-attachmentIcon .file-outer-icon.is-embedded {
   fill: #689d6a; }
@@ -156,6 +202,25 @@ a:active, a:focus, a:hover,
 .pm-simple-table-row-th .fill-primary {
   fill: #689d6a; }
 
+.pm-checkbox-fakecheck, .pm-radio-fakeradio {
+  border-color: #282828; }
+  .pm-checkbox-fakecheck [class*="icon-"], .pm-radio-fakeradio [class*="icon-"] {
+    fill: #282828; }
+
+[class*="icon-"].color-primary {
+  color: #282828; }
+  [class*="icon-"].color-primary:hover {
+    color: #537f54; }
+
+.badgeLabel, .badgeLabel-primary {
+  border-color: #537f54; }
+
+.badgeLabel,
+.badgeLabel-blue,
+.badgeLabel-primary,
+.bg-pm-blue {
+  background-color: #537f54; }
+
 .progress-contact {
   color: #689d6a; }
   .progress-contact::-moz-progress-bar {
@@ -166,7 +231,10 @@ a:active, a:focus, a:hover,
 .minicalendar-day[aria-pressed="true"],
 .minicalendar-day[aria-current="date"]::before,
 .calendar-monthgrid-day[aria-pressed="true"] .calendar-monthgrid-day-number {
-  background: #355136; }
+  background: #49704a; }
+
+.minicalendar-day[aria-current="date"][aria-pressed="true"]::before {
+  background: #689d6a; }
 
 body {
   scrollbar-color: #424242 #2d2d2d; }
@@ -180,12 +248,51 @@ body {
     box-shadow: inset 0 0 0 4px #2d2d2d;
     border-radius: 16px; }
 
+.bordered,
+.bordered-container:not([class*="composerInputMeta-"]),
+.breadcrumb-container {
+  border-color: #424242; }
+
+.squireToolbar-select-list {
+  background: #282828;
+  color: #fbf1c7; }
+
+.squireToolbar-dropdown-divider {
+  background-color: #424242; }
+
+.squireToolbar-select-item:hover {
+  background: #232323; }
+
 #pm_composer .composer,
 .composerInputMeta-overlay {
   background: #282828; }
-  #pm_composer .composer .composerHeader-container,
-  .composerInputMeta-overlay .composerHeader-container {
-    background: #353535; }
+
+.autocompleteEmails-item {
+  background-color: #232323;
+  border-color: #232323; }
+
+.autocompleteEmails-label {
+  border-left: 1px solid #424242;
+  border-right: 1px solid #424242; }
+
+.composerOptions-container.show {
+  background: #232323; }
+  .composerOptions-container.show .shadow-container {
+    background: #282828;
+    color: #fbf1c7; }
+
+.is-disabled.pm-button--error, .is-disabled.pm-button--error.pm-button--info, .is-disabled.pm-button--error.pm-button--redborder, .is-disabled.pm-button--primary, .is-disabled.pm-button--primary.pm-button--info, .is-disabled.pm-button--primary.pm-button--redborder, .is-disabled.pm-button--warning, .is-disabled.pm-button--warning.pm-button--info, .is-disabled.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info[disabled], .pm-button--error.pm-button--redborder[disabled], .pm-button--error[disabled], .pm-button--primary.pm-button--info[disabled], .pm-button--primary.pm-button--redborder[disabled], .pm-button--primary[disabled], .pm-button--warning.pm-button--info[disabled], .pm-button--warning.pm-button--redborder[disabled], .pm-button--warning[disabled], .pm-button-blue.is-disabled, .pm-button-blue.is-disabled.pm-button--info, .pm-button-blue.is-disabled.pm-button--redborder, .pm-button-blue.pm-button--info[disabled], .pm-button-blue.pm-button--redborder[disabled], .pm-button-blue[disabled], .pm-button.is-disabled.pm-button--error, .pm-button.is-disabled.pm-button--primary, .pm-button.is-disabled.pm-button--warning, .pm-button.pm-button--error[disabled], .pm-button.pm-button--primary[disabled], .pm-button.pm-button--warning[disabled], .pm-button.pm-button-blue.is-disabled, .pm-button.pm-button-blue[disabled] {
+  background-color: #232323;
+  border-color: #424242;
+  color: #0f0f0f; }
+
+.pm-button-blueborder {
+  border-color: #689d6a;
+  color: #689d6a; }
+
+.pm-button-blueborder:hover {
+  border-color: #77a779;
+  color: #77a779; }
 
 [class*="squireToolbar-row"] .squireToolbar-action-mode:active, [class*="squireToolbar-row"] .squireToolbar-action-mode:hover, [class*="squireToolbar-row"] [class*="squireToolbar-action-"]:active, [class*="squireToolbar-row"] [class*="squireToolbar-action-"]:hover {
   background: #2d2d2d !important; }
@@ -210,6 +317,9 @@ body {
 [class*="block-info-"] {
   color: #fbf1c7; }
 
+[class*="block-info"] {
+  background-color: #424242; }
+
 .fill-global-grey {
   fill: #689d6a; }
 
@@ -222,8 +332,14 @@ body {
 .item-container, .item-container-row, .contactsummary-container {
   background: #282828; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active),
-.conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .squireToolbar-container {
+.items-column-list-inner, .ReactVirtualized__Grid__innerScrollContainer {
+  border-color: #424242; }
+  .items-column-list-inner .item-container, .items-column-list-inner .item-container-row, .ReactVirtualized__Grid__innerScrollContainer .item-container, .ReactVirtualized__Grid__innerScrollContainer .item-container-row {
+    border-color: #424242; }
+
+.item-container:not(.item-is-selected):not(.read):not(.active),
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active),
+.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .squireToolbar-container {
   background: #353535; }
 
 .item-container.active, .item-is-selected {
@@ -275,15 +391,16 @@ details:first-child {
 .message-infobox {
   background-color: #282828; }
 
-.bordered,
-.bordered-container:not([class*="composerInputMeta-"]),
-.breadcrumb-container {
-  border-color: #424242; }
-
 .message-content.frame.message-frame {
   background: white;
   color: black; }
 
+.angular-squire-iframe body {
+  color: #fbf1c7;
+  background: #353535; }
+  .angular-squire-iframe body a {
+    color: #689d6a; }
+
 .pm-button, .pm-button--info, .pm-button--redborder {
   background: #282828;
   border-color: #424242;
@@ -448,16 +565,23 @@ select.pm-field, select.pm-field-icon-container {
 .pm-plans-table-row--highlighted {
   background-color: #282828; }
 
+.pm-checkbox-fakecheck,
+.pm-radio-fakeradio {
+  border-color: #689d6a;
+  background: transparent; }
+
+[class*="icon-"].color-primary {
+  color: #689d6a; }
+
+.color-global-grey-dm {
+  color: #689d6a; }
+
 .calendar-grid-heading, .calendar-monthgrid-day {
   color: #fbf1c7; }
 
 .calendar-grid-heading[aria-current="date"] {
   color: white; }
 
-.pm-checkbox-fakecheck {
-  border-color: #689d6a;
-  background: transparent; }
-
 .calendar-daygrid-weeknumber {
   background-color: #0f0f0f; }
 
diff --git a/themes/inbox/inbox.css b/themes/inbox/inbox.css
index 4f8d3c9..6ee5a20 100644
--- a/themes/inbox/inbox.css
+++ b/themes/inbox/inbox.css
@@ -1,6 +1,6 @@
 /*! =========================================== *
  * INBOX
- * Version: 4.0.0
+ * Version: v4.0.0-beta15
  * Author: Cristiano Almeida
  * Website: https://www.csalmeida.com
  * Twitter: @_csalmeida
@@ -45,6 +45,11 @@
   background-color: #7297C4;
   color: #fff; }
 
+.searchbox-advanced-search-button:active,
+.searchbox-advanced-search-button:focus,
+.searchbox-advanced-search-button:hover {
+  background-color: #F2F2F2; }
+
 .topnav-link, .topnav-link > .topnav-icon {
   color: #616161;
   transition: color .2s ease-in-out; }
@@ -57,35 +62,50 @@
 .topnav-link:hover > .topnav-icon, .topnav-link[aria-current=true] > .topnav-icon {
   color: #4285F4; }
 
+.protonmail .text-purple {
+  color: #F2F2F2 !important; }
+
+.protonmail .text-purple:hover {
+  color: #1266f1 !important; }
+
+#pm_composer .composer .composerHeader-container,
+.composerInputMeta-overlay .composerHeader-container {
+  background: white; }
+
 .conversation.marked::before {
   background: #4285F4; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
   background: #fff; }
 
-.conversation.item-container.selected, .conversation.item-container-row.selected {
+.item-container.selected, .item-container-row.selected,
+.item-container.active, .item-is-selected {
   background: rgba(66, 133, 244, 0.1); }
 
-.conversation .item-checkbox:checked + .item-icon {
-  background-color: #4285F4;
-  border-color: #4285F4; }
-
-.conversation .item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #4285F4; }
-
-.conversation .item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #616161; }
-
-.conversation .selectBoxElement-container:hover .item-icon {
+.selectBoxElement-container:hover .item-icon {
   background-color: transparent;
   border: 1px solid #2a75f3; }
-  .conversation .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
+  .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
     fill: #2a75f3; }
 
-.conversation .selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+.selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+  background-color: #2a75f3;
+  border-color: #2a75f3; }
+
+.item-checkbox:checked + .item-icon {
+  background-color: #4285F4;
+  border-color: #4285F4; }
+
+.item-checkbox + .item-icon:hover {
   background-color: #2a75f3;
   border-color: #2a75f3; }
 
+.item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #616161; }
+
+.item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #616161; }
+
 .starbutton {
   fill: #4285F4 !important;
   opacity: 0.7; }
@@ -132,10 +152,36 @@ a:active, a:focus, a:hover,
   background: #2a75f3;
   border: 1px solid #2a75f3; }
 
+.is-active.pm-button--error, .is-active.pm-button--error.pm-button--info, .is-active.pm-button--error.pm-button--redborder, .is-active.pm-button--primary, .is-active.pm-button--primary.pm-button--info, .is-active.pm-button--primary.pm-button--redborder, .is-active.pm-button--warning, .is-active.pm-button--warning.pm-button--info, .is-active.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info:not(div):active, .pm-button--error.pm-button--redborder:not(div):active, .pm-button--error:not(div):active, .pm-button--primary.pm-button--info:not(div):active, .pm-button--primary.pm-button--redborder:not(div):active, .pm-button--primary:not(div):active, .pm-button--warning.pm-button--info:not(div):active, .pm-button--warning.pm-button--redborder:not(div):active, .pm-button--warning:not(div):active, .pm-button-blue.is-active, .pm-button-blue.is-active.pm-button--info, .pm-button-blue.is-active.pm-button--redborder, .pm-button-blue.pm-button--info:not(div):active, .pm-button-blue.pm-button--redborder:not(div):active, .pm-button-blue:not(div):active, .pm-button.is-active.pm-button--error, .pm-button.is-active.pm-button--primary, .pm-button.is-active.pm-button--warning, .pm-button.pm-button--error:not(div):active, .pm-button.pm-button--primary:not(div):active, .pm-button.pm-button--warning:not(div):active, .pm-button.pm-button-blue.is-active, .pm-button.pm-button-blue:not(div):active {
+  background: #1266f1;
+  border-color: #1266f1; }
+
+.pm-button-blueborder {
+  box-shadow: none;
+  border-color: #F2F2F2;
+  color: #F2F2F2;
+  transition: color .2s ease-in-out, border-color .2s ease-in-out; }
+
+.pm-button-blueborder:hover {
+  box-shadow: none;
+  border-color: #1266f1;
+  color: #1266f1; }
+
+.is-active.pm-button--primaryborder,
+.pm-button--primaryborder:not(div):active,
+.pm-button-blueborder.is-active,
+.pm-button-blueborder:not(div):active {
+  border-color: #1266f1;
+  color: #1266f1;
+  background: transparent; }
+
 .pm-toggle-checkbox:checked + .pm-toggle-label:before {
   background: #4285F4;
   border-color: #4285F4; }
 
+.angular-squire-iframe body a {
+  color: #4285F4; }
+
 .fill-pm-blue,
 .message-attachmentIcon .file-outer-icon.is-embedded {
   fill: #4285F4; }
@@ -154,6 +200,25 @@ a:active, a:focus, a:hover,
 .pm-simple-table-row-th .fill-primary {
   fill: #4285F4; }
 
+.pm-checkbox-fakecheck, .pm-radio-fakeradio {
+  border-color: #F2F2F2; }
+  .pm-checkbox-fakecheck [class*="icon-"], .pm-radio-fakeradio [class*="icon-"] {
+    fill: #F2F2F2; }
+
+[class*="icon-"].color-primary {
+  color: #F2F2F2; }
+  [class*="icon-"].color-primary:hover {
+    color: #1266f1; }
+
+.badgeLabel, .badgeLabel-primary {
+  border-color: #1266f1; }
+
+.badgeLabel,
+.badgeLabel-blue,
+.badgeLabel-primary,
+.bg-pm-blue {
+  background-color: #1266f1; }
+
 .progress-contact {
   color: #4285F4; }
   .progress-contact::-moz-progress-bar {
@@ -164,7 +229,10 @@ a:active, a:focus, a:hover,
 .minicalendar-day[aria-pressed="true"],
 .minicalendar-day[aria-current="date"]::before,
 .calendar-monthgrid-day[aria-pressed="true"] .calendar-monthgrid-day-number {
-  background: #0a47ac; }
+  background: #0d5bdd; }
+
+.minicalendar-day[aria-current="date"][aria-pressed="true"]::before {
+  background: #4285F4; }
 
 .pm-button--error, .pm-button--primary, .pm-button--warning, .pm-button-blue {
   color: #FFF;
diff --git a/themes/monokai/monokai.css b/themes/monokai/monokai.css
index 3cf2584..98ca53b 100644
--- a/themes/monokai/monokai.css
+++ b/themes/monokai/monokai.css
@@ -1,6 +1,6 @@
 /*! =========================================== *
  * MONOKAI THEME
- * Version: 4.0.0
+ * Version: v4.0.0-beta15
  * Author: tripscripts
  * Website: N/A
  * Twitter: N/A
@@ -45,6 +45,11 @@
   background-color: #5B26D6;
   color: #e6eaf0; }
 
+.searchbox-advanced-search-button:active,
+.searchbox-advanced-search-button:focus,
+.searchbox-advanced-search-button:hover {
+  background-color: #1D1E1A; }
+
 .topnav-link, .topnav-link > .topnav-icon {
   color: #FFF;
   transition: color .2s ease-in-out; }
@@ -57,35 +62,50 @@
 .topnav-link:hover > .topnav-icon, .topnav-link[aria-current=true] > .topnav-icon {
   color: #89C62A; }
 
+.protonmail .text-purple {
+  color: #1D1E1A !important; }
+
+.protonmail .text-purple:hover {
+  color: #6c9c21 !important; }
+
+#pm_composer .composer .composerHeader-container,
+.composerInputMeta-overlay .composerHeader-container {
+  background: #2a2c26; }
+
 .conversation.marked::before {
   background: #89C62A; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
   background: #fff; }
 
-.conversation.item-container.selected, .conversation.item-container-row.selected {
+.item-container.selected, .item-container-row.selected,
+.item-container.active, .item-is-selected {
   background: rgba(137, 198, 42, 0.1); }
 
-.conversation .item-checkbox:checked + .item-icon {
-  background-color: #89C62A;
-  border-color: #89C62A; }
-
-.conversation .item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #89C62A; }
-
-.conversation .item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #FFF; }
-
-.conversation .selectBoxElement-container:hover .item-icon {
+.selectBoxElement-container:hover .item-icon {
   background-color: transparent;
   border: 1px solid #7ab126; }
-  .conversation .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
+  .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
     fill: #7ab126; }
 
-.conversation .selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+.selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
   background-color: #7ab126;
   border-color: #7ab126; }
 
+.item-checkbox:checked + .item-icon {
+  background-color: #89C62A;
+  border-color: #89C62A; }
+
+.item-checkbox + .item-icon:hover {
+  background-color: #7ab126;
+  border-color: #7ab126; }
+
+.item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #FFF; }
+
+.item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #FFF; }
+
 .starbutton {
   fill: #89C62A !important;
   opacity: 0.7; }
@@ -132,10 +152,36 @@ a:active, a:focus, a:hover,
   background: #7ab126;
   border: 1px solid #7ab126; }
 
+.is-active.pm-button--error, .is-active.pm-button--error.pm-button--info, .is-active.pm-button--error.pm-button--redborder, .is-active.pm-button--primary, .is-active.pm-button--primary.pm-button--info, .is-active.pm-button--primary.pm-button--redborder, .is-active.pm-button--warning, .is-active.pm-button--warning.pm-button--info, .is-active.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info:not(div):active, .pm-button--error.pm-button--redborder:not(div):active, .pm-button--error:not(div):active, .pm-button--primary.pm-button--info:not(div):active, .pm-button--primary.pm-button--redborder:not(div):active, .pm-button--primary:not(div):active, .pm-button--warning.pm-button--info:not(div):active, .pm-button--warning.pm-button--redborder:not(div):active, .pm-button--warning:not(div):active, .pm-button-blue.is-active, .pm-button-blue.is-active.pm-button--info, .pm-button-blue.is-active.pm-button--redborder, .pm-button-blue.pm-button--info:not(div):active, .pm-button-blue.pm-button--redborder:not(div):active, .pm-button-blue:not(div):active, .pm-button.is-active.pm-button--error, .pm-button.is-active.pm-button--primary, .pm-button.is-active.pm-button--warning, .pm-button.pm-button--error:not(div):active, .pm-button.pm-button--primary:not(div):active, .pm-button.pm-button--warning:not(div):active, .pm-button.pm-button-blue.is-active, .pm-button.pm-button-blue:not(div):active {
+  background: #6c9c21;
+  border-color: #6c9c21; }
+
+.pm-button-blueborder {
+  box-shadow: none;
+  border-color: #1D1E1A;
+  color: #1D1E1A;
+  transition: color .2s ease-in-out, border-color .2s ease-in-out; }
+
+.pm-button-blueborder:hover {
+  box-shadow: none;
+  border-color: #6c9c21;
+  color: #6c9c21; }
+
+.is-active.pm-button--primaryborder,
+.pm-button--primaryborder:not(div):active,
+.pm-button-blueborder.is-active,
+.pm-button-blueborder:not(div):active {
+  border-color: #6c9c21;
+  color: #6c9c21;
+  background: transparent; }
+
 .pm-toggle-checkbox:checked + .pm-toggle-label:before {
   background: #89C62A;
   border-color: #89C62A; }
 
+.angular-squire-iframe body a {
+  color: #89C62A; }
+
 .fill-pm-blue,
 .message-attachmentIcon .file-outer-icon.is-embedded {
   fill: #89C62A; }
@@ -154,6 +200,25 @@ a:active, a:focus, a:hover,
 .pm-simple-table-row-th .fill-primary {
   fill: #89C62A; }
 
+.pm-checkbox-fakecheck, .pm-radio-fakeradio {
+  border-color: #1D1E1A; }
+  .pm-checkbox-fakecheck [class*="icon-"], .pm-radio-fakeradio [class*="icon-"] {
+    fill: #1D1E1A; }
+
+[class*="icon-"].color-primary {
+  color: #1D1E1A; }
+  [class*="icon-"].color-primary:hover {
+    color: #6c9c21; }
+
+.badgeLabel, .badgeLabel-primary {
+  border-color: #6c9c21; }
+
+.badgeLabel,
+.badgeLabel-blue,
+.badgeLabel-primary,
+.bg-pm-blue {
+  background-color: #6c9c21; }
+
 .progress-contact {
   color: #89C62A; }
   .progress-contact::-moz-progress-bar {
@@ -164,4 +229,7 @@ a:active, a:focus, a:hover,
 .minicalendar-day[aria-pressed="true"],
 .minicalendar-day[aria-current="date"]::before,
 .calendar-monthgrid-day[aria-pressed="true"] .calendar-monthgrid-day-number {
-  background: #405d14; }
+  background: #5d871d; }
+
+.minicalendar-day[aria-current="date"][aria-pressed="true"]::before {
+  background: #89C62A; }
diff --git a/themes/monokai/monokai_full.css b/themes/monokai/monokai_full.css
index 8d6ffda..763c3a1 100644
--- a/themes/monokai/monokai_full.css
+++ b/themes/monokai/monokai_full.css
@@ -1,6 +1,6 @@
 /*! =========================================== *
  * MONOKAI THEME
- * Version: 4.0.0
+ * Version: v4.0.0-beta15
  * Author: tripscripts
  * Website: N/A
  * Twitter: N/A
@@ -45,6 +45,11 @@
   background-color: #5B26D6;
   color: #e6eaf0; }
 
+.searchbox-advanced-search-button:active,
+.searchbox-advanced-search-button:focus,
+.searchbox-advanced-search-button:hover {
+  background-color: #1D1E1A; }
+
 .topnav-link, .topnav-link > .topnav-icon {
   color: #FFF;
   transition: color .2s ease-in-out; }
@@ -57,35 +62,50 @@
 .topnav-link:hover > .topnav-icon, .topnav-link[aria-current=true] > .topnav-icon {
   color: #89C62A; }
 
+.protonmail .text-purple {
+  color: #1D1E1A !important; }
+
+.protonmail .text-purple:hover {
+  color: #6c9c21 !important; }
+
+#pm_composer .composer .composerHeader-container,
+.composerInputMeta-overlay .composerHeader-container {
+  background: #2a2c26; }
+
 .conversation.marked::before {
   background: #89C62A; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
   background: #fff; }
 
-.conversation.item-container.selected, .conversation.item-container-row.selected {
+.item-container.selected, .item-container-row.selected,
+.item-container.active, .item-is-selected {
   background: rgba(137, 198, 42, 0.1); }
 
-.conversation .item-checkbox:checked + .item-icon {
-  background-color: #89C62A;
-  border-color: #89C62A; }
-
-.conversation .item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #89C62A; }
-
-.conversation .item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #FFF; }
-
-.conversation .selectBoxElement-container:hover .item-icon {
+.selectBoxElement-container:hover .item-icon {
   background-color: transparent;
   border: 1px solid #7ab126; }
-  .conversation .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
+  .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
     fill: #7ab126; }
 
-.conversation .selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+.selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+  background-color: #7ab126;
+  border-color: #7ab126; }
+
+.item-checkbox:checked + .item-icon {
+  background-color: #89C62A;
+  border-color: #89C62A; }
+
+.item-checkbox + .item-icon:hover {
   background-color: #7ab126;
   border-color: #7ab126; }
 
+.item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #FFF; }
+
+.item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #FFF; }
+
 .starbutton {
   fill: #89C62A !important;
   opacity: 0.7; }
@@ -132,10 +152,36 @@ a:active, a:focus, a:hover,
   background: #7ab126;
   border: 1px solid #7ab126; }
 
+.is-active.pm-button--error, .is-active.pm-button--error.pm-button--info, .is-active.pm-button--error.pm-button--redborder, .is-active.pm-button--primary, .is-active.pm-button--primary.pm-button--info, .is-active.pm-button--primary.pm-button--redborder, .is-active.pm-button--warning, .is-active.pm-button--warning.pm-button--info, .is-active.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info:not(div):active, .pm-button--error.pm-button--redborder:not(div):active, .pm-button--error:not(div):active, .pm-button--primary.pm-button--info:not(div):active, .pm-button--primary.pm-button--redborder:not(div):active, .pm-button--primary:not(div):active, .pm-button--warning.pm-button--info:not(div):active, .pm-button--warning.pm-button--redborder:not(div):active, .pm-button--warning:not(div):active, .pm-button-blue.is-active, .pm-button-blue.is-active.pm-button--info, .pm-button-blue.is-active.pm-button--redborder, .pm-button-blue.pm-button--info:not(div):active, .pm-button-blue.pm-button--redborder:not(div):active, .pm-button-blue:not(div):active, .pm-button.is-active.pm-button--error, .pm-button.is-active.pm-button--primary, .pm-button.is-active.pm-button--warning, .pm-button.pm-button--error:not(div):active, .pm-button.pm-button--primary:not(div):active, .pm-button.pm-button--warning:not(div):active, .pm-button.pm-button-blue.is-active, .pm-button.pm-button-blue:not(div):active {
+  background: #6c9c21;
+  border-color: #6c9c21; }
+
+.pm-button-blueborder {
+  box-shadow: none;
+  border-color: #1D1E1A;
+  color: #1D1E1A;
+  transition: color .2s ease-in-out, border-color .2s ease-in-out; }
+
+.pm-button-blueborder:hover {
+  box-shadow: none;
+  border-color: #6c9c21;
+  color: #6c9c21; }
+
+.is-active.pm-button--primaryborder,
+.pm-button--primaryborder:not(div):active,
+.pm-button-blueborder.is-active,
+.pm-button-blueborder:not(div):active {
+  border-color: #6c9c21;
+  color: #6c9c21;
+  background: transparent; }
+
 .pm-toggle-checkbox:checked + .pm-toggle-label:before {
   background: #89C62A;
   border-color: #89C62A; }
 
+.angular-squire-iframe body a {
+  color: #89C62A; }
+
 .fill-pm-blue,
 .message-attachmentIcon .file-outer-icon.is-embedded {
   fill: #89C62A; }
@@ -154,6 +200,25 @@ a:active, a:focus, a:hover,
 .pm-simple-table-row-th .fill-primary {
   fill: #89C62A; }
 
+.pm-checkbox-fakecheck, .pm-radio-fakeradio {
+  border-color: #1D1E1A; }
+  .pm-checkbox-fakecheck [class*="icon-"], .pm-radio-fakeradio [class*="icon-"] {
+    fill: #1D1E1A; }
+
+[class*="icon-"].color-primary {
+  color: #1D1E1A; }
+  [class*="icon-"].color-primary:hover {
+    color: #6c9c21; }
+
+.badgeLabel, .badgeLabel-primary {
+  border-color: #6c9c21; }
+
+.badgeLabel,
+.badgeLabel-blue,
+.badgeLabel-primary,
+.bg-pm-blue {
+  background-color: #6c9c21; }
+
 .progress-contact {
   color: #89C62A; }
   .progress-contact::-moz-progress-bar {
@@ -164,7 +229,10 @@ a:active, a:focus, a:hover,
 .minicalendar-day[aria-pressed="true"],
 .minicalendar-day[aria-current="date"]::before,
 .calendar-monthgrid-day[aria-pressed="true"] .calendar-monthgrid-day-number {
-  background: #405d14; }
+  background: #5d871d; }
+
+.minicalendar-day[aria-current="date"][aria-pressed="true"]::before {
+  background: #89C62A; }
 
 body {
   scrollbar-color: #373932 #22231f; }
@@ -178,12 +246,51 @@ body {
     box-shadow: inset 0 0 0 4px #22231f;
     border-radius: 16px; }
 
+.bordered,
+.bordered-container:not([class*="composerInputMeta-"]),
+.breadcrumb-container {
+  border-color: #373932; }
+
+.squireToolbar-select-list {
+  background: #1D1E1A;
+  color: #e6eaf0; }
+
+.squireToolbar-dropdown-divider {
+  background-color: #373932; }
+
+.squireToolbar-select-item:hover {
+  background: #181915; }
+
 #pm_composer .composer,
 .composerInputMeta-overlay {
   background: #1D1E1A; }
-  #pm_composer .composer .composerHeader-container,
-  .composerInputMeta-overlay .composerHeader-container {
-    background: #2a2c26; }
+
+.autocompleteEmails-item {
+  background-color: #181915;
+  border-color: #181915; }
+
+.autocompleteEmails-label {
+  border-left: 1px solid #373932;
+  border-right: 1px solid #373932; }
+
+.composerOptions-container.show {
+  background: #181915; }
+  .composerOptions-container.show .shadow-container {
+    background: #1D1E1A;
+    color: #e6eaf0; }
+
+.is-disabled.pm-button--error, .is-disabled.pm-button--error.pm-button--info, .is-disabled.pm-button--error.pm-button--redborder, .is-disabled.pm-button--primary, .is-disabled.pm-button--primary.pm-button--info, .is-disabled.pm-button--primary.pm-button--redborder, .is-disabled.pm-button--warning, .is-disabled.pm-button--warning.pm-button--info, .is-disabled.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info[disabled], .pm-button--error.pm-button--redborder[disabled], .pm-button--error[disabled], .pm-button--primary.pm-button--info[disabled], .pm-button--primary.pm-button--redborder[disabled], .pm-button--primary[disabled], .pm-button--warning.pm-button--info[disabled], .pm-button--warning.pm-button--redborder[disabled], .pm-button--warning[disabled], .pm-button-blue.is-disabled, .pm-button-blue.is-disabled.pm-button--info, .pm-button-blue.is-disabled.pm-button--redborder, .pm-button-blue.pm-button--info[disabled], .pm-button-blue.pm-button--redborder[disabled], .pm-button-blue[disabled], .pm-button.is-disabled.pm-button--error, .pm-button.is-disabled.pm-button--primary, .pm-button.is-disabled.pm-button--warning, .pm-button.pm-button--error[disabled], .pm-button.pm-button--primary[disabled], .pm-button.pm-button--warning[disabled], .pm-button.pm-button-blue.is-disabled, .pm-button.pm-button-blue[disabled] {
+  background-color: #181915;
+  border-color: #373932;
+  color: #030302; }
+
+.pm-button-blueborder {
+  border-color: #89C62A;
+  color: #89C62A; }
+
+.pm-button-blueborder:hover {
+  border-color: #96d435;
+  color: #96d435; }
 
 [class*="squireToolbar-row"] .squireToolbar-action-mode:active, [class*="squireToolbar-row"] .squireToolbar-action-mode:hover, [class*="squireToolbar-row"] [class*="squireToolbar-action-"]:active, [class*="squireToolbar-row"] [class*="squireToolbar-action-"]:hover {
   background: #22231f !important; }
@@ -208,6 +315,9 @@ body {
 [class*="block-info-"] {
   color: #e6eaf0; }
 
+[class*="block-info"] {
+  background-color: #373932; }
+
 .fill-global-grey {
   fill: #89C62A; }
 
@@ -220,8 +330,14 @@ body {
 .item-container, .item-container-row, .contactsummary-container {
   background: #1D1E1A; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active),
-.conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .squireToolbar-container {
+.items-column-list-inner, .ReactVirtualized__Grid__innerScrollContainer {
+  border-color: #373932; }
+  .items-column-list-inner .item-container, .items-column-list-inner .item-container-row, .ReactVirtualized__Grid__innerScrollContainer .item-container, .ReactVirtualized__Grid__innerScrollContainer .item-container-row {
+    border-color: #373932; }
+
+.item-container:not(.item-is-selected):not(.read):not(.active),
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active),
+.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .squireToolbar-container {
   background: #2a2c26; }
 
 .item-container.active, .item-is-selected {
@@ -273,15 +389,16 @@ details:first-child {
 .message-infobox {
   background-color: #1D1E1A; }
 
-.bordered,
-.bordered-container:not([class*="composerInputMeta-"]),
-.breadcrumb-container {
-  border-color: #373932; }
-
 .message-content.frame.message-frame {
   background: white;
   color: black; }
 
+.angular-squire-iframe body {
+  color: #e6eaf0;
+  background: #2a2c26; }
+  .angular-squire-iframe body a {
+    color: #89C62A; }
+
 .pm-button, .pm-button--info, .pm-button--redborder {
   background: #1D1E1A;
   border-color: #373932;
@@ -446,16 +563,23 @@ select.pm-field, select.pm-field-icon-container {
 .pm-plans-table-row--highlighted {
   background-color: #1D1E1A; }
 
+.pm-checkbox-fakecheck,
+.pm-radio-fakeradio {
+  border-color: #89C62A;
+  background: transparent; }
+
+[class*="icon-"].color-primary {
+  color: #89C62A; }
+
+.color-global-grey-dm {
+  color: #89C62A; }
+
 .calendar-grid-heading, .calendar-monthgrid-day {
   color: #e6eaf0; }
 
 .calendar-grid-heading[aria-current="date"] {
   color: white; }
 
-.pm-checkbox-fakecheck {
-  border-color: #89C62A;
-  background: transparent; }
-
 .calendar-daygrid-weeknumber {
   background-color: #030302; }
 
diff --git a/themes/ochin/ochin.css b/themes/ochin/ochin.css
index 53e4adf..d4859a6 100644
--- a/themes/ochin/ochin.css
+++ b/themes/ochin/ochin.css
@@ -1,6 +1,6 @@
 /*! =========================================== *
  * OCHIN
- * Version: 4.0.0
+ * Version: v4.0.0-beta15
  * Author: Cristiano Almeida
  * Website: https://www.csalmeida.com
  * Twitter: @_csalmeida
@@ -45,6 +45,11 @@
   background-color: #1A2533;
   color: #e6eaf0; }
 
+.searchbox-advanced-search-button:active,
+.searchbox-advanced-search-button:focus,
+.searchbox-advanced-search-button:hover {
+  background-color: #333E4C; }
+
 .topnav-link, .topnav-link > .topnav-icon {
   color: #C2C5CA;
   transition: color .2s ease-in-out; }
@@ -57,35 +62,50 @@
 .topnav-link:hover > .topnav-icon, .topnav-link[aria-current=true] > .topnav-icon {
   color: #A8E576; }
 
+.protonmail .text-purple {
+  color: #333E4C !important; }
+
+.protonmail .text-purple:hover {
+  color: #8ddd4b !important; }
+
+#pm_composer .composer .composerHeader-container,
+.composerInputMeta-overlay .composerHeader-container {
+  background: #3d4a5b; }
+
 .conversation.marked::before {
   background: #A8E576; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
   background: #fff; }
 
-.conversation.item-container.selected, .conversation.item-container-row.selected {
+.item-container.selected, .item-container-row.selected,
+.item-container.active, .item-is-selected {
   background: rgba(168, 229, 118, 0.1); }
 
-.conversation .item-checkbox:checked + .item-icon {
-  background-color: #A8E576;
-  border-color: #A8E576; }
-
-.conversation .item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #A8E576; }
-
-.conversation .item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #C2C5CA; }
-
-.conversation .selectBoxElement-container:hover .item-icon {
+.selectBoxElement-container:hover .item-icon {
   background-color: transparent;
   border: 1px solid #9ae161; }
-  .conversation .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
+  .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
     fill: #9ae161; }
 
-.conversation .selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+.selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
   background-color: #9ae161;
   border-color: #9ae161; }
 
+.item-checkbox:checked + .item-icon {
+  background-color: #A8E576;
+  border-color: #A8E576; }
+
+.item-checkbox + .item-icon:hover {
+  background-color: #9ae161;
+  border-color: #9ae161; }
+
+.item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #C2C5CA; }
+
+.item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #C2C5CA; }
+
 .starbutton {
   fill: #A8E576 !important;
   opacity: 0.7; }
@@ -132,10 +152,36 @@ a:active, a:focus, a:hover,
   background: #9ae161;
   border: 1px solid #9ae161; }
 
+.is-active.pm-button--error, .is-active.pm-button--error.pm-button--info, .is-active.pm-button--error.pm-button--redborder, .is-active.pm-button--primary, .is-active.pm-button--primary.pm-button--info, .is-active.pm-button--primary.pm-button--redborder, .is-active.pm-button--warning, .is-active.pm-button--warning.pm-button--info, .is-active.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info:not(div):active, .pm-button--error.pm-button--redborder:not(div):active, .pm-button--error:not(div):active, .pm-button--primary.pm-button--info:not(div):active, .pm-button--primary.pm-button--redborder:not(div):active, .pm-button--primary:not(div):active, .pm-button--warning.pm-button--info:not(div):active, .pm-button--warning.pm-button--redborder:not(div):active, .pm-button--warning:not(div):active, .pm-button-blue.is-active, .pm-button-blue.is-active.pm-button--info, .pm-button-blue.is-active.pm-button--redborder, .pm-button-blue.pm-button--info:not(div):active, .pm-button-blue.pm-button--redborder:not(div):active, .pm-button-blue:not(div):active, .pm-button.is-active.pm-button--error, .pm-button.is-active.pm-button--primary, .pm-button.is-active.pm-button--warning, .pm-button.pm-button--error:not(div):active, .pm-button.pm-button--primary:not(div):active, .pm-button.pm-button--warning:not(div):active, .pm-button.pm-button-blue.is-active, .pm-button.pm-button-blue:not(div):active {
+  background: #8ddd4b;
+  border-color: #8ddd4b; }
+
+.pm-button-blueborder {
+  box-shadow: none;
+  border-color: #333E4C;
+  color: #333E4C;
+  transition: color .2s ease-in-out, border-color .2s ease-in-out; }
+
+.pm-button-blueborder:hover {
+  box-shadow: none;
+  border-color: #8ddd4b;
+  color: #8ddd4b; }
+
+.is-active.pm-button--primaryborder,
+.pm-button--primaryborder:not(div):active,
+.pm-button-blueborder.is-active,
+.pm-button-blueborder:not(div):active {
+  border-color: #8ddd4b;
+  color: #8ddd4b;
+  background: transparent; }
+
 .pm-toggle-checkbox:checked + .pm-toggle-label:before {
   background: #A8E576;
   border-color: #A8E576; }
 
+.angular-squire-iframe body a {
+  color: #A8E576; }
+
 .fill-pm-blue,
 .message-attachmentIcon .file-outer-icon.is-embedded {
   fill: #A8E576; }
@@ -154,6 +200,25 @@ a:active, a:focus, a:hover,
 .pm-simple-table-row-th .fill-primary {
   fill: #A8E576; }
 
+.pm-checkbox-fakecheck, .pm-radio-fakeradio {
+  border-color: #333E4C; }
+  .pm-checkbox-fakecheck [class*="icon-"], .pm-radio-fakeradio [class*="icon-"] {
+    fill: #333E4C; }
+
+[class*="icon-"].color-primary {
+  color: #333E4C; }
+  [class*="icon-"].color-primary:hover {
+    color: #8ddd4b; }
+
+.badgeLabel, .badgeLabel-primary {
+  border-color: #8ddd4b; }
+
+.badgeLabel,
+.badgeLabel-blue,
+.badgeLabel-primary,
+.bg-pm-blue {
+  background-color: #8ddd4b; }
+
 .progress-contact {
   color: #A8E576; }
   .progress-contact::-moz-progress-bar {
@@ -164,7 +229,10 @@ a:active, a:focus, a:hover,
 .minicalendar-day[aria-pressed="true"],
 .minicalendar-day[aria-current="date"]::before,
 .calendar-monthgrid-day[aria-pressed="true"] .calendar-monthgrid-day-number {
-  background: #66b823; }
+  background: #7fd936; }
+
+.minicalendar-day[aria-current="date"][aria-pressed="true"]::before {
+  background: #A8E576; }
 
 .pm-button--error, .pm-button--primary, .pm-button--warning, .pm-button-blue {
   color: #FFF;
diff --git a/themes/ochin/ochin_full.css b/themes/ochin/ochin_full.css
index b386159..ecd4108 100644
--- a/themes/ochin/ochin_full.css
+++ b/themes/ochin/ochin_full.css
@@ -1,6 +1,6 @@
 /*! =========================================== *
  * OCHIN
- * Version: 4.0.0
+ * Version: v4.0.0-beta15
  * Author: Cristiano Almeida
  * Website: https://www.csalmeida.com
  * Twitter: @_csalmeida
@@ -45,6 +45,11 @@
   background-color: #1A2533;
   color: #e6eaf0; }
 
+.searchbox-advanced-search-button:active,
+.searchbox-advanced-search-button:focus,
+.searchbox-advanced-search-button:hover {
+  background-color: #333E4C; }
+
 .topnav-link, .topnav-link > .topnav-icon {
   color: #C2C5CA;
   transition: color .2s ease-in-out; }
@@ -57,35 +62,50 @@
 .topnav-link:hover > .topnav-icon, .topnav-link[aria-current=true] > .topnav-icon {
   color: #A8E576; }
 
+.protonmail .text-purple {
+  color: #333E4C !important; }
+
+.protonmail .text-purple:hover {
+  color: #8ddd4b !important; }
+
+#pm_composer .composer .composerHeader-container,
+.composerInputMeta-overlay .composerHeader-container {
+  background: #3d4a5b; }
+
 .conversation.marked::before {
   background: #A8E576; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
   background: #fff; }
 
-.conversation.item-container.selected, .conversation.item-container-row.selected {
+.item-container.selected, .item-container-row.selected,
+.item-container.active, .item-is-selected {
   background: rgba(168, 229, 118, 0.1); }
 
-.conversation .item-checkbox:checked + .item-icon {
-  background-color: #A8E576;
-  border-color: #A8E576; }
-
-.conversation .item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #A8E576; }
-
-.conversation .item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #C2C5CA; }
-
-.conversation .selectBoxElement-container:hover .item-icon {
+.selectBoxElement-container:hover .item-icon {
   background-color: transparent;
   border: 1px solid #9ae161; }
-  .conversation .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
+  .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
     fill: #9ae161; }
 
-.conversation .selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+.selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+  background-color: #9ae161;
+  border-color: #9ae161; }
+
+.item-checkbox:checked + .item-icon {
+  background-color: #A8E576;
+  border-color: #A8E576; }
+
+.item-checkbox + .item-icon:hover {
   background-color: #9ae161;
   border-color: #9ae161; }
 
+.item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #C2C5CA; }
+
+.item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #C2C5CA; }
+
 .starbutton {
   fill: #A8E576 !important;
   opacity: 0.7; }
@@ -132,10 +152,36 @@ a:active, a:focus, a:hover,
   background: #9ae161;
   border: 1px solid #9ae161; }
 
+.is-active.pm-button--error, .is-active.pm-button--error.pm-button--info, .is-active.pm-button--error.pm-button--redborder, .is-active.pm-button--primary, .is-active.pm-button--primary.pm-button--info, .is-active.pm-button--primary.pm-button--redborder, .is-active.pm-button--warning, .is-active.pm-button--warning.pm-button--info, .is-active.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info:not(div):active, .pm-button--error.pm-button--redborder:not(div):active, .pm-button--error:not(div):active, .pm-button--primary.pm-button--info:not(div):active, .pm-button--primary.pm-button--redborder:not(div):active, .pm-button--primary:not(div):active, .pm-button--warning.pm-button--info:not(div):active, .pm-button--warning.pm-button--redborder:not(div):active, .pm-button--warning:not(div):active, .pm-button-blue.is-active, .pm-button-blue.is-active.pm-button--info, .pm-button-blue.is-active.pm-button--redborder, .pm-button-blue.pm-button--info:not(div):active, .pm-button-blue.pm-button--redborder:not(div):active, .pm-button-blue:not(div):active, .pm-button.is-active.pm-button--error, .pm-button.is-active.pm-button--primary, .pm-button.is-active.pm-button--warning, .pm-button.pm-button--error:not(div):active, .pm-button.pm-button--primary:not(div):active, .pm-button.pm-button--warning:not(div):active, .pm-button.pm-button-blue.is-active, .pm-button.pm-button-blue:not(div):active {
+  background: #8ddd4b;
+  border-color: #8ddd4b; }
+
+.pm-button-blueborder {
+  box-shadow: none;
+  border-color: #333E4C;
+  color: #333E4C;
+  transition: color .2s ease-in-out, border-color .2s ease-in-out; }
+
+.pm-button-blueborder:hover {
+  box-shadow: none;
+  border-color: #8ddd4b;
+  color: #8ddd4b; }
+
+.is-active.pm-button--primaryborder,
+.pm-button--primaryborder:not(div):active,
+.pm-button-blueborder.is-active,
+.pm-button-blueborder:not(div):active {
+  border-color: #8ddd4b;
+  color: #8ddd4b;
+  background: transparent; }
+
 .pm-toggle-checkbox:checked + .pm-toggle-label:before {
   background: #A8E576;
   border-color: #A8E576; }
 
+.angular-squire-iframe body a {
+  color: #A8E576; }
+
 .fill-pm-blue,
 .message-attachmentIcon .file-outer-icon.is-embedded {
   fill: #A8E576; }
@@ -154,6 +200,25 @@ a:active, a:focus, a:hover,
 .pm-simple-table-row-th .fill-primary {
   fill: #A8E576; }
 
+.pm-checkbox-fakecheck, .pm-radio-fakeradio {
+  border-color: #333E4C; }
+  .pm-checkbox-fakecheck [class*="icon-"], .pm-radio-fakeradio [class*="icon-"] {
+    fill: #333E4C; }
+
+[class*="icon-"].color-primary {
+  color: #333E4C; }
+  [class*="icon-"].color-primary:hover {
+    color: #8ddd4b; }
+
+.badgeLabel, .badgeLabel-primary {
+  border-color: #8ddd4b; }
+
+.badgeLabel,
+.badgeLabel-blue,
+.badgeLabel-primary,
+.bg-pm-blue {
+  background-color: #8ddd4b; }
+
 .progress-contact {
   color: #A8E576; }
   .progress-contact::-moz-progress-bar {
@@ -164,7 +229,10 @@ a:active, a:focus, a:hover,
 .minicalendar-day[aria-pressed="true"],
 .minicalendar-day[aria-current="date"]::before,
 .calendar-monthgrid-day[aria-pressed="true"] .calendar-monthgrid-day-number {
-  background: #66b823; }
+  background: #7fd936; }
+
+.minicalendar-day[aria-current="date"][aria-pressed="true"]::before {
+  background: #A8E576; }
 
 body {
   scrollbar-color: #47576b #374352; }
@@ -178,12 +246,51 @@ body {
     box-shadow: inset 0 0 0 4px #374352;
     border-radius: 16px; }
 
+.bordered,
+.bordered-container:not([class*="composerInputMeta-"]),
+.breadcrumb-container {
+  border-color: #47576b; }
+
+.squireToolbar-select-list {
+  background: #333E4C;
+  color: #e6eaf0; }
+
+.squireToolbar-dropdown-divider {
+  background-color: #47576b; }
+
+.squireToolbar-select-item:hover {
+  background: #2f3946; }
+
 #pm_composer .composer,
 .composerInputMeta-overlay {
   background: #333E4C; }
-  #pm_composer .composer .composerHeader-container,
-  .composerInputMeta-overlay .composerHeader-container {
-    background: #3d4a5b; }
+
+.autocompleteEmails-item {
+  background-color: #2f3946;
+  border-color: #2f3946; }
+
+.autocompleteEmails-label {
+  border-left: 1px solid #47576b;
+  border-right: 1px solid #47576b; }
+
+.composerOptions-container.show {
+  background: #2f3946; }
+  .composerOptions-container.show .shadow-container {
+    background: #333E4C;
+    color: #e6eaf0; }
+
+.is-disabled.pm-button--error, .is-disabled.pm-button--error.pm-button--info, .is-disabled.pm-button--error.pm-button--redborder, .is-disabled.pm-button--primary, .is-disabled.pm-button--primary.pm-button--info, .is-disabled.pm-button--primary.pm-button--redborder, .is-disabled.pm-button--warning, .is-disabled.pm-button--warning.pm-button--info, .is-disabled.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info[disabled], .pm-button--error.pm-button--redborder[disabled], .pm-button--error[disabled], .pm-button--primary.pm-button--info[disabled], .pm-button--primary.pm-button--redborder[disabled], .pm-button--primary[disabled], .pm-button--warning.pm-button--info[disabled], .pm-button--warning.pm-button--redborder[disabled], .pm-button--warning[disabled], .pm-button-blue.is-disabled, .pm-button-blue.is-disabled.pm-button--info, .pm-button-blue.is-disabled.pm-button--redborder, .pm-button-blue.pm-button--info[disabled], .pm-button-blue.pm-button--redborder[disabled], .pm-button-blue[disabled], .pm-button.is-disabled.pm-button--error, .pm-button.is-disabled.pm-button--primary, .pm-button.is-disabled.pm-button--warning, .pm-button.pm-button--error[disabled], .pm-button.pm-button--primary[disabled], .pm-button.pm-button--warning[disabled], .pm-button.pm-button-blue.is-disabled, .pm-button.pm-button-blue[disabled] {
+  background-color: #2f3946;
+  border-color: #47576b;
+  color: #1f252d; }
+
+.pm-button-blueborder {
+  border-color: #A8E576;
+  color: #A8E576; }
+
+.pm-button-blueborder:hover {
+  border-color: #b6e98b;
+  color: #b6e98b; }
 
 [class*="squireToolbar-row"] .squireToolbar-action-mode:active, [class*="squireToolbar-row"] .squireToolbar-action-mode:hover, [class*="squireToolbar-row"] [class*="squireToolbar-action-"]:active, [class*="squireToolbar-row"] [class*="squireToolbar-action-"]:hover {
   background: #374352 !important; }
@@ -208,6 +315,9 @@ body {
 [class*="block-info-"] {
   color: #e6eaf0; }
 
+[class*="block-info"] {
+  background-color: #47576b; }
+
 .fill-global-grey {
   fill: #A8E576; }
 
@@ -220,8 +330,14 @@ body {
 .item-container, .item-container-row, .contactsummary-container {
   background: #333E4C; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active),
-.conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .squireToolbar-container {
+.items-column-list-inner, .ReactVirtualized__Grid__innerScrollContainer {
+  border-color: #47576b; }
+  .items-column-list-inner .item-container, .items-column-list-inner .item-container-row, .ReactVirtualized__Grid__innerScrollContainer .item-container, .ReactVirtualized__Grid__innerScrollContainer .item-container-row {
+    border-color: #47576b; }
+
+.item-container:not(.item-is-selected):not(.read):not(.active),
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active),
+.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .squireToolbar-container {
   background: #3d4a5b; }
 
 .item-container.active, .item-is-selected {
@@ -273,15 +389,16 @@ details:first-child {
 .message-infobox {
   background-color: #333E4C; }
 
-.bordered,
-.bordered-container:not([class*="composerInputMeta-"]),
-.breadcrumb-container {
-  border-color: #47576b; }
-
 .message-content.frame.message-frame {
   background: white;
   color: black; }
 
+.angular-squire-iframe body {
+  color: #e6eaf0;
+  background: #3d4a5b; }
+  .angular-squire-iframe body a {
+    color: #A8E576; }
+
 .pm-button, .pm-button--info, .pm-button--redborder {
   background: #333E4C;
   border-color: #47576b;
@@ -446,16 +563,23 @@ select.pm-field, select.pm-field-icon-container {
 .pm-plans-table-row--highlighted {
   background-color: #333E4C; }
 
+.pm-checkbox-fakecheck,
+.pm-radio-fakeradio {
+  border-color: #A8E576;
+  background: transparent; }
+
+[class*="icon-"].color-primary {
+  color: #A8E576; }
+
+.color-global-grey-dm {
+  color: #A8E576; }
+
 .calendar-grid-heading, .calendar-monthgrid-day {
   color: #e6eaf0; }
 
 .calendar-grid-heading[aria-current="date"] {
   color: white; }
 
-.pm-checkbox-fakecheck {
-  border-color: #A8E576;
-  background: transparent; }
-
 .calendar-daygrid-weeknumber {
   background-color: #1f252d; }
 
diff --git a/themes/vitamin_c/vitamin_c.css b/themes/vitamin_c/vitamin_c.css
index 64484d5..b497dca 100644
--- a/themes/vitamin_c/vitamin_c.css
+++ b/themes/vitamin_c/vitamin_c.css
@@ -1,6 +1,6 @@
 /*! =========================================== *
  * VITAMIN C THEME
- * Version: 4.0.0
+ * Version: v4.0.0-beta15
  * Author: Cristiano Almeida
  * Website: www.csalmeida.com
  * Twitter: @_csalmeida
@@ -45,6 +45,11 @@
   background-color: #1F8A70;
   color: #e6eaf0; }
 
+.searchbox-advanced-search-button:active,
+.searchbox-advanced-search-button:focus,
+.searchbox-advanced-search-button:hover {
+  background-color: #004358; }
+
 .topnav-link, .topnav-link > .topnav-icon {
   color: #FFE11A;
   transition: color .2s ease-in-out; }
@@ -57,35 +62,50 @@
 .topnav-link:hover > .topnav-icon, .topnav-link[aria-current=true] > .topnav-icon {
   color: #FD7400; }
 
+.protonmail .text-purple {
+  color: #004358 !important; }
+
+.protonmail .text-purple:hover {
+  color: #ca5d00 !important; }
+
+#pm_composer .composer .composerHeader-container,
+.composerInputMeta-overlay .composerHeader-container {
+  background: #005672; }
+
 .conversation.marked::before {
   background: #FD7400; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
   background: #fff; }
 
-.conversation.item-container.selected, .conversation.item-container-row.selected {
+.item-container.selected, .item-container-row.selected,
+.item-container.active, .item-is-selected {
   background: rgba(253, 116, 0, 0.1); }
 
-.conversation .item-checkbox:checked + .item-icon {
-  background-color: #FD7400;
-  border-color: #FD7400; }
-
-.conversation .item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #FD7400; }
-
-.conversation .item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #FFE11A; }
-
-.conversation .selectBoxElement-container:hover .item-icon {
+.selectBoxElement-container:hover .item-icon {
   background-color: transparent;
   border: 1px solid #e46800; }
-  .conversation .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
+  .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
     fill: #e46800; }
 
-.conversation .selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+.selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
   background-color: #e46800;
   border-color: #e46800; }
 
+.item-checkbox:checked + .item-icon {
+  background-color: #FD7400;
+  border-color: #FD7400; }
+
+.item-checkbox + .item-icon:hover {
+  background-color: #e46800;
+  border-color: #e46800; }
+
+.item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #FFE11A; }
+
+.item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #FFE11A; }
+
 .starbutton {
   fill: #FD7400 !important;
   opacity: 0.7; }
@@ -132,10 +152,36 @@ a:active, a:focus, a:hover,
   background: #e46800;
   border: 1px solid #e46800; }
 
+.is-active.pm-button--error, .is-active.pm-button--error.pm-button--info, .is-active.pm-button--error.pm-button--redborder, .is-active.pm-button--primary, .is-active.pm-button--primary.pm-button--info, .is-active.pm-button--primary.pm-button--redborder, .is-active.pm-button--warning, .is-active.pm-button--warning.pm-button--info, .is-active.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info:not(div):active, .pm-button--error.pm-button--redborder:not(div):active, .pm-button--error:not(div):active, .pm-button--primary.pm-button--info:not(div):active, .pm-button--primary.pm-button--redborder:not(div):active, .pm-button--primary:not(div):active, .pm-button--warning.pm-button--info:not(div):active, .pm-button--warning.pm-button--redborder:not(div):active, .pm-button--warning:not(div):active, .pm-button-blue.is-active, .pm-button-blue.is-active.pm-button--info, .pm-button-blue.is-active.pm-button--redborder, .pm-button-blue.pm-button--info:not(div):active, .pm-button-blue.pm-button--redborder:not(div):active, .pm-button-blue:not(div):active, .pm-button.is-active.pm-button--error, .pm-button.is-active.pm-button--primary, .pm-button.is-active.pm-button--warning, .pm-button.pm-button--error:not(div):active, .pm-button.pm-button--primary:not(div):active, .pm-button.pm-button--warning:not(div):active, .pm-button.pm-button-blue.is-active, .pm-button.pm-button-blue:not(div):active {
+  background: #ca5d00;
+  border-color: #ca5d00; }
+
+.pm-button-blueborder {
+  box-shadow: none;
+  border-color: #004358;
+  color: #004358;
+  transition: color .2s ease-in-out, border-color .2s ease-in-out; }
+
+.pm-button-blueborder:hover {
+  box-shadow: none;
+  border-color: #ca5d00;
+  color: #ca5d00; }
+
+.is-active.pm-button--primaryborder,
+.pm-button--primaryborder:not(div):active,
+.pm-button-blueborder.is-active,
+.pm-button-blueborder:not(div):active {
+  border-color: #ca5d00;
+  color: #ca5d00;
+  background: transparent; }
+
 .pm-toggle-checkbox:checked + .pm-toggle-label:before {
   background: #FD7400;
   border-color: #FD7400; }
 
+.angular-squire-iframe body a {
+  color: #FD7400; }
+
 .fill-pm-blue,
 .message-attachmentIcon .file-outer-icon.is-embedded {
   fill: #FD7400; }
@@ -154,6 +200,25 @@ a:active, a:focus, a:hover,
 .pm-simple-table-row-th .fill-primary {
   fill: #FD7400; }
 
+.pm-checkbox-fakecheck, .pm-radio-fakeradio {
+  border-color: #004358; }
+  .pm-checkbox-fakecheck [class*="icon-"], .pm-radio-fakeradio [class*="icon-"] {
+    fill: #004358; }
+
+[class*="icon-"].color-primary {
+  color: #004358; }
+  [class*="icon-"].color-primary:hover {
+    color: #ca5d00; }
+
+.badgeLabel, .badgeLabel-primary {
+  border-color: #ca5d00; }
+
+.badgeLabel,
+.badgeLabel-blue,
+.badgeLabel-primary,
+.bg-pm-blue {
+  background-color: #ca5d00; }
+
 .progress-contact {
   color: #FD7400; }
   .progress-contact::-moz-progress-bar {
@@ -164,4 +229,7 @@ a:active, a:focus, a:hover,
 .minicalendar-day[aria-pressed="true"],
 .minicalendar-day[aria-current="date"]::before,
 .calendar-monthgrid-day[aria-pressed="true"] .calendar-monthgrid-day-number {
-  background: #7e3a00; }
+  background: #b15100; }
+
+.minicalendar-day[aria-current="date"][aria-pressed="true"]::before {
+  background: #FD7400; }
diff --git a/themes/vitamin_c/vitamin_c_full.css b/themes/vitamin_c/vitamin_c_full.css
index 40fc6f9..2058aef 100644
--- a/themes/vitamin_c/vitamin_c_full.css
+++ b/themes/vitamin_c/vitamin_c_full.css
@@ -1,6 +1,6 @@
 /*! =========================================== *
  * VITAMIN C THEME
- * Version: 4.0.0
+ * Version: v4.0.0-beta15
  * Author: Cristiano Almeida
  * Website: www.csalmeida.com
  * Twitter: @_csalmeida
@@ -45,6 +45,11 @@
   background-color: #1F8A70;
   color: #e6eaf0; }
 
+.searchbox-advanced-search-button:active,
+.searchbox-advanced-search-button:focus,
+.searchbox-advanced-search-button:hover {
+  background-color: #004358; }
+
 .topnav-link, .topnav-link > .topnav-icon {
   color: #FFE11A;
   transition: color .2s ease-in-out; }
@@ -57,35 +62,50 @@
 .topnav-link:hover > .topnav-icon, .topnav-link[aria-current=true] > .topnav-icon {
   color: #FD7400; }
 
+.protonmail .text-purple {
+  color: #004358 !important; }
+
+.protonmail .text-purple:hover {
+  color: #ca5d00 !important; }
+
+#pm_composer .composer .composerHeader-container,
+.composerInputMeta-overlay .composerHeader-container {
+  background: #005672; }
+
 .conversation.marked::before {
   background: #FD7400; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active) {
   background: #fff; }
 
-.conversation.item-container.selected, .conversation.item-container-row.selected {
+.item-container.selected, .item-container-row.selected,
+.item-container.active, .item-is-selected {
   background: rgba(253, 116, 0, 0.1); }
 
-.conversation .item-checkbox:checked + .item-icon {
-  background-color: #FD7400;
-  border-color: #FD7400; }
-
-.conversation .item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #FD7400; }
-
-.conversation .item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
-  fill: #FFE11A; }
-
-.conversation .selectBoxElement-container:hover .item-icon {
+.selectBoxElement-container:hover .item-icon {
   background-color: transparent;
   border: 1px solid #e46800; }
-  .conversation .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
+  .selectBoxElement-container:hover .item-icon .item-icon-fakecheck-icon {
     fill: #e46800; }
 
-.conversation .selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+.selectBoxElement-container:hover .item-checkbox:checked + .item-icon {
+  background-color: #e46800;
+  border-color: #e46800; }
+
+.item-checkbox:checked + .item-icon {
+  background-color: #FD7400;
+  border-color: #FD7400; }
+
+.item-checkbox + .item-icon:hover {
   background-color: #e46800;
   border-color: #e46800; }
 
+.item-checkbox + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #FFE11A; }
+
+.item-checkbox:checked + .item-icon:hover .item-icon-fakecheck-icon {
+  fill: #FFE11A; }
+
 .starbutton {
   fill: #FD7400 !important;
   opacity: 0.7; }
@@ -132,10 +152,36 @@ a:active, a:focus, a:hover,
   background: #e46800;
   border: 1px solid #e46800; }
 
+.is-active.pm-button--error, .is-active.pm-button--error.pm-button--info, .is-active.pm-button--error.pm-button--redborder, .is-active.pm-button--primary, .is-active.pm-button--primary.pm-button--info, .is-active.pm-button--primary.pm-button--redborder, .is-active.pm-button--warning, .is-active.pm-button--warning.pm-button--info, .is-active.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info:not(div):active, .pm-button--error.pm-button--redborder:not(div):active, .pm-button--error:not(div):active, .pm-button--primary.pm-button--info:not(div):active, .pm-button--primary.pm-button--redborder:not(div):active, .pm-button--primary:not(div):active, .pm-button--warning.pm-button--info:not(div):active, .pm-button--warning.pm-button--redborder:not(div):active, .pm-button--warning:not(div):active, .pm-button-blue.is-active, .pm-button-blue.is-active.pm-button--info, .pm-button-blue.is-active.pm-button--redborder, .pm-button-blue.pm-button--info:not(div):active, .pm-button-blue.pm-button--redborder:not(div):active, .pm-button-blue:not(div):active, .pm-button.is-active.pm-button--error, .pm-button.is-active.pm-button--primary, .pm-button.is-active.pm-button--warning, .pm-button.pm-button--error:not(div):active, .pm-button.pm-button--primary:not(div):active, .pm-button.pm-button--warning:not(div):active, .pm-button.pm-button-blue.is-active, .pm-button.pm-button-blue:not(div):active {
+  background: #ca5d00;
+  border-color: #ca5d00; }
+
+.pm-button-blueborder {
+  box-shadow: none;
+  border-color: #004358;
+  color: #004358;
+  transition: color .2s ease-in-out, border-color .2s ease-in-out; }
+
+.pm-button-blueborder:hover {
+  box-shadow: none;
+  border-color: #ca5d00;
+  color: #ca5d00; }
+
+.is-active.pm-button--primaryborder,
+.pm-button--primaryborder:not(div):active,
+.pm-button-blueborder.is-active,
+.pm-button-blueborder:not(div):active {
+  border-color: #ca5d00;
+  color: #ca5d00;
+  background: transparent; }
+
 .pm-toggle-checkbox:checked + .pm-toggle-label:before {
   background: #FD7400;
   border-color: #FD7400; }
 
+.angular-squire-iframe body a {
+  color: #FD7400; }
+
 .fill-pm-blue,
 .message-attachmentIcon .file-outer-icon.is-embedded {
   fill: #FD7400; }
@@ -154,6 +200,25 @@ a:active, a:focus, a:hover,
 .pm-simple-table-row-th .fill-primary {
   fill: #FD7400; }
 
+.pm-checkbox-fakecheck, .pm-radio-fakeradio {
+  border-color: #004358; }
+  .pm-checkbox-fakecheck [class*="icon-"], .pm-radio-fakeradio [class*="icon-"] {
+    fill: #004358; }
+
+[class*="icon-"].color-primary {
+  color: #004358; }
+  [class*="icon-"].color-primary:hover {
+    color: #ca5d00; }
+
+.badgeLabel, .badgeLabel-primary {
+  border-color: #ca5d00; }
+
+.badgeLabel,
+.badgeLabel-blue,
+.badgeLabel-primary,
+.bg-pm-blue {
+  background-color: #ca5d00; }
+
 .progress-contact {
   color: #FD7400; }
   .progress-contact::-moz-progress-bar {
@@ -164,7 +229,10 @@ a:active, a:focus, a:hover,
 .minicalendar-day[aria-pressed="true"],
 .minicalendar-day[aria-current="date"]::before,
 .calendar-monthgrid-day[aria-pressed="true"] .calendar-monthgrid-day-number {
-  background: #7e3a00; }
+  background: #b15100; }
+
+.minicalendar-day[aria-current="date"][aria-pressed="true"]::before {
+  background: #FD7400; }
 
 body {
   scrollbar-color: #006a8b #004b62; }
@@ -178,12 +246,51 @@ body {
     box-shadow: inset 0 0 0 4px #004b62;
     border-radius: 16px; }
 
+.bordered,
+.bordered-container:not([class*="composerInputMeta-"]),
+.breadcrumb-container {
+  border-color: #006a8b; }
+
+.squireToolbar-select-list {
+  background: #004358;
+  color: #e6eaf0; }
+
+.squireToolbar-dropdown-divider {
+  background-color: #006a8b; }
+
+.squireToolbar-select-item:hover {
+  background: #003b4e; }
+
 #pm_composer .composer,
 .composerInputMeta-overlay {
   background: #004358; }
-  #pm_composer .composer .composerHeader-container,
-  .composerInputMeta-overlay .composerHeader-container {
-    background: #005672; }
+
+.autocompleteEmails-item {
+  background-color: #003b4e;
+  border-color: #003b4e; }
+
+.autocompleteEmails-label {
+  border-left: 1px solid #006a8b;
+  border-right: 1px solid #006a8b; }
+
+.composerOptions-container.show {
+  background: #003b4e; }
+  .composerOptions-container.show .shadow-container {
+    background: #004358;
+    color: #e6eaf0; }
+
+.is-disabled.pm-button--error, .is-disabled.pm-button--error.pm-button--info, .is-disabled.pm-button--error.pm-button--redborder, .is-disabled.pm-button--primary, .is-disabled.pm-button--primary.pm-button--info, .is-disabled.pm-button--primary.pm-button--redborder, .is-disabled.pm-button--warning, .is-disabled.pm-button--warning.pm-button--info, .is-disabled.pm-button--warning.pm-button--redborder, .pm-button--error.pm-button--info[disabled], .pm-button--error.pm-button--redborder[disabled], .pm-button--error[disabled], .pm-button--primary.pm-button--info[disabled], .pm-button--primary.pm-button--redborder[disabled], .pm-button--primary[disabled], .pm-button--warning.pm-button--info[disabled], .pm-button--warning.pm-button--redborder[disabled], .pm-button--warning[disabled], .pm-button-blue.is-disabled, .pm-button-blue.is-disabled.pm-button--info, .pm-button-blue.is-disabled.pm-button--redborder, .pm-button-blue.pm-button--info[disabled], .pm-button-blue.pm-button--redborder[disabled], .pm-button-blue[disabled], .pm-button.is-disabled.pm-button--error, .pm-button.is-disabled.pm-button--primary, .pm-button.is-disabled.pm-button--warning, .pm-button.pm-button--error[disabled], .pm-button.pm-button--primary[disabled], .pm-button.pm-button--warning[disabled], .pm-button.pm-button-blue.is-disabled, .pm-button.pm-button-blue[disabled] {
+  background-color: #003b4e;
+  border-color: #006a8b;
+  color: #001c25; }
+
+.pm-button-blueborder {
+  border-color: #FD7400;
+  color: #FD7400; }
+
+.pm-button-blueborder:hover {
+  border-color: #ff8218;
+  color: #ff8218; }
 
 [class*="squireToolbar-row"] .squireToolbar-action-mode:active, [class*="squireToolbar-row"] .squireToolbar-action-mode:hover, [class*="squireToolbar-row"] [class*="squireToolbar-action-"]:active, [class*="squireToolbar-row"] [class*="squireToolbar-action-"]:hover {
   background: #004b62 !important; }
@@ -208,6 +315,9 @@ body {
 [class*="block-info-"] {
   color: #e6eaf0; }
 
+[class*="block-info"] {
+  background-color: #006a8b; }
+
 .fill-global-grey {
   fill: #FD7400; }
 
@@ -220,8 +330,14 @@ body {
 .item-container, .item-container-row, .contactsummary-container {
   background: #004358; }
 
-.conversation.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active),
-.conversation.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .squireToolbar-container {
+.items-column-list-inner, .ReactVirtualized__Grid__innerScrollContainer {
+  border-color: #006a8b; }
+  .items-column-list-inner .item-container, .items-column-list-inner .item-container-row, .ReactVirtualized__Grid__innerScrollContainer .item-container, .ReactVirtualized__Grid__innerScrollContainer .item-container-row {
+    border-color: #006a8b; }
+
+.item-container:not(.item-is-selected):not(.read):not(.active),
+.item-container:not(.item-is-selected):not(.item-contact):not(.read):not(.active),
+.item-container-row:not(.item-is-selected):not(.item-contact):not(.read):not(.active), .squireToolbar-container {
   background: #005672; }
 
 .item-container.active, .item-is-selected {
@@ -273,15 +389,16 @@ details:first-child {
 .message-infobox {
   background-color: #004358; }
 
-.bordered,
-.bordered-container:not([class*="composerInputMeta-"]),
-.breadcrumb-container {
-  border-color: #006a8b; }
-
 .message-content.frame.message-frame {
   background: white;
   color: black; }
 
+.angular-squire-iframe body {
+  color: #e6eaf0;
+  background: #005672; }
+  .angular-squire-iframe body a {
+    color: #FD7400; }
+
 .pm-button, .pm-button--info, .pm-button--redborder {
   background: #004358;
   border-color: #006a8b;
@@ -446,16 +563,23 @@ select.pm-field, select.pm-field-icon-container {
 .pm-plans-table-row--highlighted {
   background-color: #004358; }
 
+.pm-checkbox-fakecheck,
+.pm-radio-fakeradio {
+  border-color: #FD7400;
+  background: transparent; }
+
+[class*="icon-"].color-primary {
+  color: #FD7400; }
+
+.color-global-grey-dm {
+  color: #FD7400; }
+
 .calendar-grid-heading, .calendar-monthgrid-day {
   color: #e6eaf0; }
 
 .calendar-grid-heading[aria-current="date"] {
   color: white; }
 
-.pm-checkbox-fakecheck {
-  border-color: #FD7400;
-  background: transparent; }
-
 .calendar-daygrid-weeknumber {
   background-color: #001c25; }