diff --git a/install.sh b/install.sh
index b77322eb..51825eff 100755
--- a/install.sh
+++ b/install.sh
@@ -628,7 +628,7 @@ install_theme() {
     done
   done
 
-  if (which xfce4-popup-whiskermenu 2> /dev/null); then
+  if (command -v xfce4-popup-whiskermenu &> /dev/null) && $(sed -i "s|.*menu-opacity=.*|menu-opacity=95|" "$HOME/.config/xfce4/panel/whiskermenu"*".rc" &> /dev/null); then
     sed -i "s|.*menu-opacity=.*|menu-opacity=95|" "$HOME/.config/xfce4/panel/whiskermenu"*".rc"
   fi
 
diff --git a/src/sass/gtk/apps/_xfce.scss b/src/sass/gtk/apps/_xfce.scss
index b8843d78..8d93c55f 100644
--- a/src/sass/gtk/apps/_xfce.scss
+++ b/src/sass/gtk/apps/_xfce.scss
@@ -15,17 +15,24 @@
 .xfce4-panel.background {
   border: none; // Sadly the border is hard-coded
   background-color: $panel;
-  color: on($panel, secondary);
+  color: $panel-text-secondary;
   font-weight: 500;
 
   button {
     @extend %button-flat;
-    @extend %button-on-dark;
-
     min-height: 16px;
     min-width: 16px;
     padding: 0 $space-size;
     border-radius: 0;
+    color: $panel-text-secondary;
+
+    &:hover, &:active, &:checked {
+      color: $panel-text;
+    }
+
+    &:disabled {
+      color: $panel-text-secondary-disabled;
+    }
 
     &.flat.toggle {
       padding: 0 $space-size;