diff --git a/src/main/gnome-shell/gdm3-dark-blue.css b/src/main/gnome-shell/gdm3-dark-blue.css
index 138381f..d3f2f84 100644
--- a/src/main/gnome-shell/gdm3-dark-blue.css
+++ b/src/main/gnome-shell/gdm3-dark-blue.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #2E7CF7;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #2E7CF7;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #2E7CF7;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-dark-green.css b/src/main/gnome-shell/gdm3-dark-green.css
index e577b20..4b96c3b 100644
--- a/src/main/gnome-shell/gdm3-dark-green.css
+++ b/src/main/gnome-shell/gdm3-dark-green.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #79B757;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #79B757;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #79B757;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-dark-grey.css b/src/main/gnome-shell/gdm3-dark-grey.css
index 6b83160..4d43ba3 100644
--- a/src/main/gnome-shell/gdm3-dark-grey.css
+++ b/src/main/gnome-shell/gdm3-dark-grey.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #8C8C8C;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #8C8C8C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #8C8C8C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-dark-orange.css b/src/main/gnome-shell/gdm3-dark-orange.css
index ef89e0e..1b365ff 100644
--- a/src/main/gnome-shell/gdm3-dark-orange.css
+++ b/src/main/gnome-shell/gdm3-dark-orange.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E9873A;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #E9873A;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #E9873A;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-dark-pink.css b/src/main/gnome-shell/gdm3-dark-pink.css
index 0e268d2..ebb02df 100644
--- a/src/main/gnome-shell/gdm3-dark-pink.css
+++ b/src/main/gnome-shell/gdm3-dark-pink.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E55E9C;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #E55E9C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #E55E9C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-dark-purple.css b/src/main/gnome-shell/gdm3-dark-purple.css
index 03d965e..03a8519 100644
--- a/src/main/gnome-shell/gdm3-dark-purple.css
+++ b/src/main/gnome-shell/gdm3-dark-purple.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #9A57A3;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #9A57A3;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #9A57A3;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-dark-red.css b/src/main/gnome-shell/gdm3-dark-red.css
index 3d1b10f..590484e 100644
--- a/src/main/gnome-shell/gdm3-dark-red.css
+++ b/src/main/gnome-shell/gdm3-dark-red.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #ED5F5D;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #ED5F5D;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #ED5F5D;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-dark-yellow.css b/src/main/gnome-shell/gdm3-dark-yellow.css
index 72f6778..01ff33b 100644
--- a/src/main/gnome-shell/gdm3-dark-yellow.css
+++ b/src/main/gnome-shell/gdm3-dark-yellow.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #F3BA4B;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #F3BA4B;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #F3BA4B;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-light-blue.css b/src/main/gnome-shell/gdm3-light-blue.css
index 09e5413..21cf22f 100644
--- a/src/main/gnome-shell/gdm3-light-blue.css
+++ b/src/main/gnome-shell/gdm3-light-blue.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #2E7CF7;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #2E7CF7;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #2E7CF7;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-light-green.css b/src/main/gnome-shell/gdm3-light-green.css
index f5a5de3..6c84cfc 100644
--- a/src/main/gnome-shell/gdm3-light-green.css
+++ b/src/main/gnome-shell/gdm3-light-green.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #79B757;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #79B757;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #79B757;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-light-grey.css b/src/main/gnome-shell/gdm3-light-grey.css
index 7959e46..856dd86 100644
--- a/src/main/gnome-shell/gdm3-light-grey.css
+++ b/src/main/gnome-shell/gdm3-light-grey.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #8C8C8C;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #8C8C8C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #8C8C8C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-light-orange.css b/src/main/gnome-shell/gdm3-light-orange.css
index edb9ab6..6dbf0e4 100644
--- a/src/main/gnome-shell/gdm3-light-orange.css
+++ b/src/main/gnome-shell/gdm3-light-orange.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E9873A;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #E9873A;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #E9873A;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-light-pink.css b/src/main/gnome-shell/gdm3-light-pink.css
index 2776657..e831ae6 100644
--- a/src/main/gnome-shell/gdm3-light-pink.css
+++ b/src/main/gnome-shell/gdm3-light-pink.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E55E9C;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #E55E9C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #E55E9C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-light-purple.css b/src/main/gnome-shell/gdm3-light-purple.css
index 9d2d05b..b6f4e8b 100644
--- a/src/main/gnome-shell/gdm3-light-purple.css
+++ b/src/main/gnome-shell/gdm3-light-purple.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #9A57A3;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #9A57A3;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #9A57A3;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-light-red.css b/src/main/gnome-shell/gdm3-light-red.css
index 3f9cac8..bc71dcc 100644
--- a/src/main/gnome-shell/gdm3-light-red.css
+++ b/src/main/gnome-shell/gdm3-light-red.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #ED5F5D;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #ED5F5D;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #ED5F5D;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-light-yellow.css b/src/main/gnome-shell/gdm3-light-yellow.css
index 48ed76d..245833a 100644
--- a/src/main/gnome-shell/gdm3-light-yellow.css
+++ b/src/main/gnome-shell/gdm3-light-yellow.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #F3BA4B;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #F3BA4B;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #F3BA4B;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt-blue.css b/src/main/gnome-shell/gnome-shell-dark-alt-blue.css
index 12107a9..e8ecb72 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-blue.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-blue.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #2E7CF7;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #2E7CF7;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #2E7CF7;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt-green.css b/src/main/gnome-shell/gnome-shell-dark-alt-green.css
index 822e9b3..54f4567 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-green.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-green.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #79B757;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #79B757;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #79B757;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt-grey.css b/src/main/gnome-shell/gnome-shell-dark-alt-grey.css
index c78e673..c6dc017 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-grey.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-grey.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #8C8C8C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #8C8C8C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #8C8C8C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt-orange.css b/src/main/gnome-shell/gnome-shell-dark-alt-orange.css
index 5c2f889..2453c66 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-orange.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-orange.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E9873A;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #E9873A;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #E9873A;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt-pink.css b/src/main/gnome-shell/gnome-shell-dark-alt-pink.css
index 9172757..426a754 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-pink.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-pink.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E55E9C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #E55E9C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #E55E9C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt-purple.css b/src/main/gnome-shell/gnome-shell-dark-alt-purple.css
index 7851c03..c9f8ebf 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-purple.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-purple.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #9A57A3;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #9A57A3;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #9A57A3;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt-red.css b/src/main/gnome-shell/gnome-shell-dark-alt-red.css
index 71976dc..3940bbf 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-red.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-red.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #ED5F5D;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #ED5F5D;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #ED5F5D;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt-yellow.css b/src/main/gnome-shell/gnome-shell-dark-alt-yellow.css
index 957bb8a..a321c7f 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-yellow.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #F3BA4B;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #F3BA4B;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #F3BA4B;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt.css b/src/main/gnome-shell/gnome-shell-dark-alt.css
index adbf13d..df10a1d 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #0860F2;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #0860F2;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #0860F2;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-blue.css b/src/main/gnome-shell/gnome-shell-dark-blue.css
index 12107a9..e8ecb72 100644
--- a/src/main/gnome-shell/gnome-shell-dark-blue.css
+++ b/src/main/gnome-shell/gnome-shell-dark-blue.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #2E7CF7;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #2E7CF7;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #2E7CF7;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-green.css b/src/main/gnome-shell/gnome-shell-dark-green.css
index 822e9b3..54f4567 100644
--- a/src/main/gnome-shell/gnome-shell-dark-green.css
+++ b/src/main/gnome-shell/gnome-shell-dark-green.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #79B757;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #79B757;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #79B757;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-grey.css b/src/main/gnome-shell/gnome-shell-dark-grey.css
index c78e673..c6dc017 100644
--- a/src/main/gnome-shell/gnome-shell-dark-grey.css
+++ b/src/main/gnome-shell/gnome-shell-dark-grey.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #8C8C8C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #8C8C8C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #8C8C8C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-orange.css b/src/main/gnome-shell/gnome-shell-dark-orange.css
index 5c2f889..2453c66 100644
--- a/src/main/gnome-shell/gnome-shell-dark-orange.css
+++ b/src/main/gnome-shell/gnome-shell-dark-orange.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E9873A;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #E9873A;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #E9873A;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-pink.css b/src/main/gnome-shell/gnome-shell-dark-pink.css
index 9172757..426a754 100644
--- a/src/main/gnome-shell/gnome-shell-dark-pink.css
+++ b/src/main/gnome-shell/gnome-shell-dark-pink.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E55E9C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #E55E9C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #E55E9C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-purple.css b/src/main/gnome-shell/gnome-shell-dark-purple.css
index 7851c03..c9f8ebf 100644
--- a/src/main/gnome-shell/gnome-shell-dark-purple.css
+++ b/src/main/gnome-shell/gnome-shell-dark-purple.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #9A57A3;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #9A57A3;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #9A57A3;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-red.css b/src/main/gnome-shell/gnome-shell-dark-red.css
index 71976dc..3940bbf 100644
--- a/src/main/gnome-shell/gnome-shell-dark-red.css
+++ b/src/main/gnome-shell/gnome-shell-dark-red.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #ED5F5D;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #ED5F5D;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #ED5F5D;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt-blue.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt-blue.css
index 73dab02..5d1121e 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt-blue.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt-blue.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #2E7CF7;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #2E7CF7;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #2E7CF7;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt-green.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt-green.css
index 4ef75ca..c04bba9 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt-green.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt-green.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #79B757;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #79B757;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #79B757;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt-grey.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt-grey.css
index 651bd04..5d119cf 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt-grey.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt-grey.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #8C8C8C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #8C8C8C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #8C8C8C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt-orange.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt-orange.css
index 01daebd..f926e9d 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt-orange.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt-orange.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E9873A;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #E9873A;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #E9873A;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt-pink.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt-pink.css
index ef94061..f8d62a7 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt-pink.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt-pink.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E55E9C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #E55E9C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #E55E9C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt-purple.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt-purple.css
index ca2215a..be211c5 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt-purple.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt-purple.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #9A57A3;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #9A57A3;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #9A57A3;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt-red.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt-red.css
index a4aa28d..30196bc 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt-red.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt-red.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #ED5F5D;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #ED5F5D;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #ED5F5D;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt-yellow.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt-yellow.css
index bfcdadc..785de38 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt-yellow.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #F3BA4B;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #F3BA4B;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #F3BA4B;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
index 5d3499f..0ef4e52 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #0860F2;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #0860F2;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #0860F2;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-blue.css b/src/main/gnome-shell/gnome-shell-dark-solid-blue.css
index 73dab02..5d1121e 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-blue.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-blue.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #2E7CF7;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #2E7CF7;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #2E7CF7;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-green.css b/src/main/gnome-shell/gnome-shell-dark-solid-green.css
index 4ef75ca..c04bba9 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-green.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-green.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #79B757;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #79B757;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #79B757;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-grey.css b/src/main/gnome-shell/gnome-shell-dark-solid-grey.css
index 651bd04..5d119cf 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-grey.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-grey.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #8C8C8C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #8C8C8C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #8C8C8C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-orange.css b/src/main/gnome-shell/gnome-shell-dark-solid-orange.css
index 01daebd..f926e9d 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-orange.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-orange.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E9873A;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #E9873A;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #E9873A;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-pink.css b/src/main/gnome-shell/gnome-shell-dark-solid-pink.css
index ef94061..f8d62a7 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-pink.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-pink.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E55E9C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #E55E9C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #E55E9C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-purple.css b/src/main/gnome-shell/gnome-shell-dark-solid-purple.css
index ca2215a..be211c5 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-purple.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-purple.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #9A57A3;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #9A57A3;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #9A57A3;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-red.css b/src/main/gnome-shell/gnome-shell-dark-solid-red.css
index a4aa28d..30196bc 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-red.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-red.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #ED5F5D;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #ED5F5D;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #ED5F5D;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-yellow.css b/src/main/gnome-shell/gnome-shell-dark-solid-yellow.css
index bfcdadc..785de38 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-yellow.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #F3BA4B;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #F3BA4B;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #F3BA4B;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-yellow.css b/src/main/gnome-shell/gnome-shell-dark-yellow.css
index 957bb8a..a321c7f 100644
--- a/src/main/gnome-shell/gnome-shell-dark-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-dark-yellow.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #F3BA4B;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #F3BA4B;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #F3BA4B;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-alt-blue.css b/src/main/gnome-shell/gnome-shell-light-alt-blue.css
index 94268b8..2b00e7c 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-blue.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-blue.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #2E7CF7;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #2E7CF7;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #2E7CF7;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-alt-green.css b/src/main/gnome-shell/gnome-shell-light-alt-green.css
index 6525117..13e7d8f 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-green.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-green.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #79B757;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #79B757;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #79B757;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-alt-grey.css b/src/main/gnome-shell/gnome-shell-light-alt-grey.css
index 4ce14d3..626b2d9 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-grey.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-grey.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #8C8C8C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #8C8C8C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #8C8C8C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-alt-orange.css b/src/main/gnome-shell/gnome-shell-light-alt-orange.css
index ce56d2b..7e96569 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-orange.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-orange.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E9873A;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #E9873A;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #E9873A;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-alt-pink.css b/src/main/gnome-shell/gnome-shell-light-alt-pink.css
index 0673379..44e2300 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-pink.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-pink.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E55E9C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #E55E9C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #E55E9C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-alt-purple.css b/src/main/gnome-shell/gnome-shell-light-alt-purple.css
index 192d681..75f2d12 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-purple.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-purple.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #9A57A3;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #9A57A3;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #9A57A3;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-alt-red.css b/src/main/gnome-shell/gnome-shell-light-alt-red.css
index dbe647d..261e2d8 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-red.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-red.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #ED5F5D;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #ED5F5D;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #ED5F5D;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-alt-yellow.css b/src/main/gnome-shell/gnome-shell-light-alt-yellow.css
index b347a53..227df75 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-yellow.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #F3BA4B;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #F3BA4B;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #F3BA4B;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-alt.css b/src/main/gnome-shell/gnome-shell-light-alt.css
index 8cbb6fc..e8dd871 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #0860F2;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #0860F2;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #0860F2;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-blue.css b/src/main/gnome-shell/gnome-shell-light-blue.css
index ce4d184..03ca85b 100644
--- a/src/main/gnome-shell/gnome-shell-light-blue.css
+++ b/src/main/gnome-shell/gnome-shell-light-blue.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #2E7CF7;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #2E7CF7;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #2E7CF7;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-green.css b/src/main/gnome-shell/gnome-shell-light-green.css
index 80b5114..c5c0183 100644
--- a/src/main/gnome-shell/gnome-shell-light-green.css
+++ b/src/main/gnome-shell/gnome-shell-light-green.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #79B757;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #79B757;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #79B757;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-grey.css b/src/main/gnome-shell/gnome-shell-light-grey.css
index 5ae0ed5..041a713 100644
--- a/src/main/gnome-shell/gnome-shell-light-grey.css
+++ b/src/main/gnome-shell/gnome-shell-light-grey.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #8C8C8C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #8C8C8C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #8C8C8C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-orange.css b/src/main/gnome-shell/gnome-shell-light-orange.css
index c84dddc..b6b09c6 100644
--- a/src/main/gnome-shell/gnome-shell-light-orange.css
+++ b/src/main/gnome-shell/gnome-shell-light-orange.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E9873A;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #E9873A;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #E9873A;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-pink.css b/src/main/gnome-shell/gnome-shell-light-pink.css
index 0482cb5..8a30930 100644
--- a/src/main/gnome-shell/gnome-shell-light-pink.css
+++ b/src/main/gnome-shell/gnome-shell-light-pink.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E55E9C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #E55E9C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #E55E9C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-purple.css b/src/main/gnome-shell/gnome-shell-light-purple.css
index 30fe31e..88e5a7c 100644
--- a/src/main/gnome-shell/gnome-shell-light-purple.css
+++ b/src/main/gnome-shell/gnome-shell-light-purple.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #9A57A3;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #9A57A3;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #9A57A3;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-red.css b/src/main/gnome-shell/gnome-shell-light-red.css
index fd6a803..ddf3c80 100644
--- a/src/main/gnome-shell/gnome-shell-light-red.css
+++ b/src/main/gnome-shell/gnome-shell-light-red.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #ED5F5D;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #ED5F5D;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #ED5F5D;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt-blue.css b/src/main/gnome-shell/gnome-shell-light-solid-alt-blue.css
index 161aacc..423bdb2 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt-blue.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt-blue.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #2E7CF7;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #2E7CF7;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #2E7CF7;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt-green.css b/src/main/gnome-shell/gnome-shell-light-solid-alt-green.css
index 8ba2495..a7f308f 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt-green.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt-green.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #79B757;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #79B757;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #79B757;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt-grey.css b/src/main/gnome-shell/gnome-shell-light-solid-alt-grey.css
index d5f531f..40aa2c1 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt-grey.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt-grey.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #8C8C8C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #8C8C8C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #8C8C8C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt-orange.css b/src/main/gnome-shell/gnome-shell-light-solid-alt-orange.css
index bfb4edd..3d4cefb 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt-orange.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt-orange.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E9873A;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #E9873A;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #E9873A;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt-pink.css b/src/main/gnome-shell/gnome-shell-light-solid-alt-pink.css
index 621c5b5..b9b0135 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt-pink.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt-pink.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E55E9C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #E55E9C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #E55E9C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt-purple.css b/src/main/gnome-shell/gnome-shell-light-solid-alt-purple.css
index 1a3d234..2ba3df4 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt-purple.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt-purple.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #9A57A3;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #9A57A3;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #9A57A3;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt-red.css b/src/main/gnome-shell/gnome-shell-light-solid-alt-red.css
index 3f3e66b..f9476d1 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt-red.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt-red.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #ED5F5D;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #ED5F5D;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #ED5F5D;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt-yellow.css b/src/main/gnome-shell/gnome-shell-light-solid-alt-yellow.css
index bfb4edd..3d4cefb 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt-yellow.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E9873A;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #E9873A;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #E9873A;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt.css b/src/main/gnome-shell/gnome-shell-light-solid-alt.css
index 6e67c3c..889075d 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #0860F2;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #0860F2;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #0860F2;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-blue.css b/src/main/gnome-shell/gnome-shell-light-solid-blue.css
index 161aacc..423bdb2 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-blue.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-blue.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #2E7CF7;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #2E7CF7;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #2E7CF7;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-green.css b/src/main/gnome-shell/gnome-shell-light-solid-green.css
index 8ba2495..a7f308f 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-green.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-green.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #79B757;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #79B757;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #79B757;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-grey.css b/src/main/gnome-shell/gnome-shell-light-solid-grey.css
index d5f531f..40aa2c1 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-grey.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-grey.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #8C8C8C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #8C8C8C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #8C8C8C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-orange.css b/src/main/gnome-shell/gnome-shell-light-solid-orange.css
index bfb4edd..3d4cefb 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-orange.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-orange.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E9873A;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #E9873A;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #E9873A;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-pink.css b/src/main/gnome-shell/gnome-shell-light-solid-pink.css
index 621c5b5..b9b0135 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-pink.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-pink.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E55E9C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #E55E9C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #E55E9C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-purple.css b/src/main/gnome-shell/gnome-shell-light-solid-purple.css
index 1a3d234..2ba3df4 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-purple.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-purple.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #9A57A3;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #9A57A3;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #9A57A3;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-red.css b/src/main/gnome-shell/gnome-shell-light-solid-red.css
index 3f3e66b..f9476d1 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-red.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-red.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #ED5F5D;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #ED5F5D;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #ED5F5D;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-yellow.css b/src/main/gnome-shell/gnome-shell-light-solid-yellow.css
index f005590..b3291ae 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-yellow.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #F3BA4B;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #F3BA4B;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #F3BA4B;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-yellow.css b/src/main/gnome-shell/gnome-shell-light-yellow.css
index a3c622d..b6dfb4c 100644
--- a/src/main/gnome-shell/gnome-shell-light-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-light-yellow.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
   box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #F3BA4B;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #F3BA4B;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #F3BA4B;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gtk-3.0/gtk-dark-blue.css b/src/main/gtk-3.0/gtk-dark-blue.css
index cc4fe74..a11091f 100644
--- a/src/main/gtk-3.0/gtk-dark-blue.css
+++ b/src/main/gtk-3.0/gtk-dark-blue.css
@@ -10067,17 +10067,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid rgba(77, 77, 77, 0.95);
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-green.css b/src/main/gtk-3.0/gtk-dark-green.css
index 6ef18be..0363682 100644
--- a/src/main/gtk-3.0/gtk-dark-green.css
+++ b/src/main/gtk-3.0/gtk-dark-green.css
@@ -10067,17 +10067,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid rgba(77, 77, 77, 0.95);
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-grey.css b/src/main/gtk-3.0/gtk-dark-grey.css
index 133054d..6063bc3 100644
--- a/src/main/gtk-3.0/gtk-dark-grey.css
+++ b/src/main/gtk-3.0/gtk-dark-grey.css
@@ -10067,17 +10067,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid rgba(77, 77, 77, 0.95);
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-orange.css b/src/main/gtk-3.0/gtk-dark-orange.css
index d805cb2..ce356d3 100644
--- a/src/main/gtk-3.0/gtk-dark-orange.css
+++ b/src/main/gtk-3.0/gtk-dark-orange.css
@@ -10067,17 +10067,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid rgba(77, 77, 77, 0.95);
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-pink.css b/src/main/gtk-3.0/gtk-dark-pink.css
index ed01211..3840cce 100644
--- a/src/main/gtk-3.0/gtk-dark-pink.css
+++ b/src/main/gtk-3.0/gtk-dark-pink.css
@@ -10067,17 +10067,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid rgba(77, 77, 77, 0.95);
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-purple.css b/src/main/gtk-3.0/gtk-dark-purple.css
index aea4c45..46d59bb 100644
--- a/src/main/gtk-3.0/gtk-dark-purple.css
+++ b/src/main/gtk-3.0/gtk-dark-purple.css
@@ -10067,17 +10067,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid rgba(77, 77, 77, 0.95);
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-red.css b/src/main/gtk-3.0/gtk-dark-red.css
index 13bd1fb..3ce5ab0 100644
--- a/src/main/gtk-3.0/gtk-dark-red.css
+++ b/src/main/gtk-3.0/gtk-dark-red.css
@@ -10067,17 +10067,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid rgba(77, 77, 77, 0.95);
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid-blue.css b/src/main/gtk-3.0/gtk-dark-solid-blue.css
index db4ee2c..b834833 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-blue.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-blue.css
@@ -10071,17 +10071,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid #4d4d4d;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid-green.css b/src/main/gtk-3.0/gtk-dark-solid-green.css
index a713079..475e4f9 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-green.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-green.css
@@ -10071,17 +10071,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid #4d4d4d;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid-grey.css b/src/main/gtk-3.0/gtk-dark-solid-grey.css
index 7af7370..3d208aa 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-grey.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-grey.css
@@ -10071,17 +10071,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid #4d4d4d;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid-orange.css b/src/main/gtk-3.0/gtk-dark-solid-orange.css
index 9165361..406a90a 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-orange.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-orange.css
@@ -10071,17 +10071,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid #4d4d4d;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid-pink.css b/src/main/gtk-3.0/gtk-dark-solid-pink.css
index 6154855..90d9557 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-pink.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-pink.css
@@ -10071,17 +10071,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid #4d4d4d;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid-purple.css b/src/main/gtk-3.0/gtk-dark-solid-purple.css
index 9c0fcb3..90941dd 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-purple.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-purple.css
@@ -10071,17 +10071,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid #4d4d4d;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid-red.css b/src/main/gtk-3.0/gtk-dark-solid-red.css
index e06eff5..b6b2211 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-red.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-red.css
@@ -10071,17 +10071,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid #4d4d4d;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid-yellow.css b/src/main/gtk-3.0/gtk-dark-solid-yellow.css
index 640376b..4966222 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-yellow.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-yellow.css
@@ -10071,17 +10071,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid #4d4d4d;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-yellow.css b/src/main/gtk-3.0/gtk-dark-yellow.css
index d1eea9c..70ce813 100644
--- a/src/main/gtk-3.0/gtk-dark-yellow.css
+++ b/src/main/gtk-3.0/gtk-dark-yellow.css
@@ -10067,17 +10067,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid rgba(77, 77, 77, 0.95);
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-blue.css b/src/main/gtk-3.0/gtk-light-blue.css
index 80496a0..5a1b4f1 100644
--- a/src/main/gtk-3.0/gtk-light-blue.css
+++ b/src/main/gtk-3.0/gtk-light-blue.css
@@ -10105,16 +10105,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-green.css b/src/main/gtk-3.0/gtk-light-green.css
index 40e1210..a8e2e99 100644
--- a/src/main/gtk-3.0/gtk-light-green.css
+++ b/src/main/gtk-3.0/gtk-light-green.css
@@ -10105,16 +10105,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-grey.css b/src/main/gtk-3.0/gtk-light-grey.css
index 929ad45..f3e70db 100644
--- a/src/main/gtk-3.0/gtk-light-grey.css
+++ b/src/main/gtk-3.0/gtk-light-grey.css
@@ -10105,16 +10105,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-orange.css b/src/main/gtk-3.0/gtk-light-orange.css
index 14b8c73..28545b4 100644
--- a/src/main/gtk-3.0/gtk-light-orange.css
+++ b/src/main/gtk-3.0/gtk-light-orange.css
@@ -10105,16 +10105,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-pink.css b/src/main/gtk-3.0/gtk-light-pink.css
index ddbfb17..a8a34e9 100644
--- a/src/main/gtk-3.0/gtk-light-pink.css
+++ b/src/main/gtk-3.0/gtk-light-pink.css
@@ -10105,16 +10105,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-purple.css b/src/main/gtk-3.0/gtk-light-purple.css
index e9b2906..46f41c0 100644
--- a/src/main/gtk-3.0/gtk-light-purple.css
+++ b/src/main/gtk-3.0/gtk-light-purple.css
@@ -10105,16 +10105,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-red.css b/src/main/gtk-3.0/gtk-light-red.css
index 9b8e098..31aa1a0 100644
--- a/src/main/gtk-3.0/gtk-light-red.css
+++ b/src/main/gtk-3.0/gtk-light-red.css
@@ -10105,16 +10105,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid-blue.css b/src/main/gtk-3.0/gtk-light-solid-blue.css
index 1b0e8e7..81e3c9a 100644
--- a/src/main/gtk-3.0/gtk-light-solid-blue.css
+++ b/src/main/gtk-3.0/gtk-light-solid-blue.css
@@ -10109,16 +10109,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid-green.css b/src/main/gtk-3.0/gtk-light-solid-green.css
index 741c509..201fb00 100644
--- a/src/main/gtk-3.0/gtk-light-solid-green.css
+++ b/src/main/gtk-3.0/gtk-light-solid-green.css
@@ -10109,16 +10109,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid-grey.css b/src/main/gtk-3.0/gtk-light-solid-grey.css
index 6e282c3..177fe0c 100644
--- a/src/main/gtk-3.0/gtk-light-solid-grey.css
+++ b/src/main/gtk-3.0/gtk-light-solid-grey.css
@@ -10109,16 +10109,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid-orange.css b/src/main/gtk-3.0/gtk-light-solid-orange.css
index 6d39841..20e0883 100644
--- a/src/main/gtk-3.0/gtk-light-solid-orange.css
+++ b/src/main/gtk-3.0/gtk-light-solid-orange.css
@@ -10109,16 +10109,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid-pink.css b/src/main/gtk-3.0/gtk-light-solid-pink.css
index ef31194..c19fec2 100644
--- a/src/main/gtk-3.0/gtk-light-solid-pink.css
+++ b/src/main/gtk-3.0/gtk-light-solid-pink.css
@@ -10109,16 +10109,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid-purple.css b/src/main/gtk-3.0/gtk-light-solid-purple.css
index f5ddfb2..d3bce78 100644
--- a/src/main/gtk-3.0/gtk-light-solid-purple.css
+++ b/src/main/gtk-3.0/gtk-light-solid-purple.css
@@ -10109,16 +10109,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid-red.css b/src/main/gtk-3.0/gtk-light-solid-red.css
index dda6032..aae5e14 100644
--- a/src/main/gtk-3.0/gtk-light-solid-red.css
+++ b/src/main/gtk-3.0/gtk-light-solid-red.css
@@ -10109,16 +10109,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid-yellow.css b/src/main/gtk-3.0/gtk-light-solid-yellow.css
index 187e658..3c12e7d 100644
--- a/src/main/gtk-3.0/gtk-light-solid-yellow.css
+++ b/src/main/gtk-3.0/gtk-light-solid-yellow.css
@@ -10109,16 +10109,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-yellow.css b/src/main/gtk-3.0/gtk-light-yellow.css
index 155c514..6c7fb88 100644
--- a/src/main/gtk-3.0/gtk-light-yellow.css
+++ b/src/main/gtk-3.0/gtk-light-yellow.css
@@ -10105,16 +10105,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }