diff --git a/styles/base.css b/styles/base.css
index 019e3e86..4fb6d6a5 100644
--- a/styles/base.css
+++ b/styles/base.css
@@ -266,10 +266,6 @@ trough {
     margin: .5em .5em;
 }
 
-.popup {
-    background-color: @text-inv;
-}
-
 .action_bar {
     /* min-width: 4.5em; */
     /* min-height: 4.5em; */
diff --git a/styles/colorized/style.css b/styles/colorized/style.css
index 4e3b1082..a17e0b8c 100644
--- a/styles/colorized/style.css
+++ b/styles/colorized/style.css
@@ -165,10 +165,6 @@ textview .time {
     color:  @solarized-base1;
 }
 
-.popup {
-    background-color: @solarized-cyan;
-}
-
 .dialog {
     border: @solarized-base03;
     background-color: @solarized-base03;
diff --git a/styles/material-dark/style.css b/styles/material-dark/style.css
index 1e4c6e56..8f079682 100644
--- a/styles/material-dark/style.css
+++ b/styles/material-dark/style.css
@@ -15,7 +15,6 @@
 @define-color active-dark #282828;
 @define-color lines #a2a2a2;
 @define-color slider #d81549;
-@define-color popup #006064;
 
 * {
     color: @text;
@@ -148,10 +147,6 @@ textview .time {
     color: @lines;
 }
 
-.popup {
-    background-color: @popup;
-}
-
 .dialog {
     border: @bg;
     background-color: @bg;
diff --git a/styles/material-darker/style.css b/styles/material-darker/style.css
index 808a2281..33934d29 100644
--- a/styles/material-darker/style.css
+++ b/styles/material-darker/style.css
@@ -142,10 +142,6 @@ textview .time {
     color: #9E9E9E;
 }
 
-.popup {
-    background-color: #006064;
-}
-
 .dialog {
     border: 0;
     background-color: #121212;
diff --git a/styles/material-light/style.css b/styles/material-light/style.css
index f8e518e8..92f4433e 100644
--- a/styles/material-light/style.css
+++ b/styles/material-light/style.css
@@ -10,7 +10,6 @@
 @define-color warning #FFE082;
 @define-color error #EF9A9A;
 @define-color echo #a1ef9a;
-@define-color popup #006064;
 @define-color textview #212121;
 
 * {
@@ -196,10 +195,6 @@ textview .time {
     color: @border;
 }
 
-.popup {
-    background-color: @popup;
-}
-
 .dialog {
     border: @border;
     background-color: @bg;
diff --git a/styles/z-bolt/style.css b/styles/z-bolt/style.css
index 868bceb6..5c4c1f4f 100644
--- a/styles/z-bolt/style.css
+++ b/styles/z-bolt/style.css
@@ -4,12 +4,14 @@
 @define-color color4 #A7E100;
 @define-color bg #13181C;
 @define-color active #324A5E;
+@define-color echo #007D70;
 @define-color error #981E1F;
-@define-color warning #f9a825;
+@define-color warning #F9A825;
+@define-color warning-text #434343;
 @define-color text white;
 @define-color text-inv black;
 @define-color lines #cccccc;
-@define-color switch-scale-bg #3584e4;
+@define-color switch-scale-bg #3584E4;
 
 * {
     color: @text;
@@ -127,10 +129,6 @@ textview .time {
     color: @lines;
 }
 
-.popup {
-    background-color: @text-inv;
-}
-
 .dialog {
     border: @bg;
     background-color: @bg;
@@ -181,12 +179,19 @@ textview .time {
     color: @text-inv;
 }
 
-.warning {
-    background-color: rgba(30, 204, 39, 0.7);
+.message_popup_echo {
+    background-color: @echo;
 }
 
-.error {
-    background-color: rgba(204, 30, 30, 0.7);
+.message_popup_warning {
+    background-color: @warning;
+}
+
+.message_popup_warning label {
+    color: @warning-text;
+}
+.message_popup_error {
+    background-color: @error;
 }
 
 .keyboard_pad {