diff --git a/de/home/.config/eww/eww.scss b/de/home/.config/eww/eww.scss
index 483925b..7dd065d 100644
--- a/de/home/.config/eww/eww.scss
+++ b/de/home/.config/eww/eww.scss
@@ -167,13 +167,9 @@ button.active {
   border-left: 0px solid $bar-bg-color;
 }
 
-<<<<<<< HEAD
-.revealer-on-hover>widget>box>revealer>box>box>box{
-=======
 //.revealer-on-hover>widget>box>revealer>box>box>button {
 .rightgroup>.revealer-on-hover>widget>box>box>button,
 .leftgroup>.revealer-on-hover>widget>box>box>button {
->>>>>>> f5a1d6f7653fde497fb7c26cc48614f6a264b80b
   border-radius: 8px;
   &:hover {
     border-radius:$bar-module-border-radius 0px 0px $bar-module-border-radius;
diff --git a/de/home/.config/sway/config.d/window_rules b/de/home/.config/sway/config.d/window_rules
index faf6895..f56d36e 100644
--- a/de/home/.config/sway/config.d/window_rules
+++ b/de/home/.config/sway/config.d/window_rules
@@ -41,12 +41,12 @@ for_window {
   [app_id="udiskie"] $popup
   [title="^Picture-in-Picture$"] $popup
   [app_id="org.keepassxc.KeePassXC" title="^(?=.*(^Unlock Database|Browser Access Request$|\[Locked\])).*$"] $popup, resize set height 50 ppt, resize set width 75 ppt
-  [app_id="yad"] $popup
 
 #float - float
   [app_id="xdg-desktop-portal-gtk"] $float
   [app_id="Alacritty_Float"] $float
   [class="^Signal$"] $float
+  [app_id="org.kde.dolphin" title="^Extracting Files"] $float
 
 #game - inhibit idle focus, no border, fullscreen, floating
   [instance="origin.exe"] $game