diff --git a/.config/hypr/applications.conf b/.config/hypr/applications.conf
index 3ac47f8..f988619 100644
--- a/.config/hypr/applications.conf
+++ b/.config/hypr/applications.conf
@@ -1,5 +1,9 @@
 # Minecraft Launcher
-windowrulev2 = tile, floating:0, xwayland:1, class:Minecraft Launcher
+windowrulev2 = pseudo, class:^(Minecraft Launcher)$
+# Floating
+windowrulev2 = float, title:Play Timer
+windowrulev2 = float, class:play-timer
 
 # Opacity
 windowrule = opacity 0.85 0.75 ,class:^(kitty)$
+
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 25135a6..2015baa 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -52,7 +52,7 @@ env = NVD_BACKEND,direct
 # }
 
 # permission = /usr/(bin|local/bin)/grim, screencopy, allow
-# permission = /usr/(lib|libexec|lib64)/xdg-desktop-portal-hyprland, screencopy, allow
+# permission = /usr/(lib|libexec|lib64)/xdg-deskclass:(?!Minecraft Launcher).*top-portal-hyprland, screencopy, allow
 # permission = /usr/(bin|local/bin)/hyprpm, plugin, allow
 
 
@@ -144,10 +144,6 @@ exec-once = hyprctl setcursor Breeze 24
 ### KEYBINDINGS ###
 ##################
 
-source = ~/.config/hypr/keybinds.conf
-source = ~/.config/hypr/applications.conf
-source = ~/.config/hypr/decoration.conf
-
 # See https://wiki.hypr.land/Configuring/Keywords/
 $mainMod = SUPER # Sets "Windows" key as main modifier
 
@@ -226,7 +222,15 @@ bindl = , XF86AudioPrev, exec, playerctl previous
 # windowrule = float,class:^(kitty)$,title:^(kitty)$
 
 # Ignore maximize requests from apps. You'll probably like this.
-windowrule = suppressevent maximize, class:.*
+windowrule = suppressevent maximize, class:(?!Minecraft Launcher).*
 
 # Fix some dragging issues with XWayland
 windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
+
+windowrule = pseudo,class:^$,title:^$,xwayland:1
+
+source = ~/.config/hypr/keybinds.conf
+source = ~/.config/hypr/applications.conf
+source = ~/.config/hypr/decoration.conf
+
+
diff --git a/.config/waybar/config b/.config/waybar/config
index 99dec07..0f03d7e 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -6,14 +6,14 @@
   "modules-left": [
   	"hyprland/workspaces",
   	"custom/uptime",
-  	"cpu"
+  	"cpu",
+	"tray"
   ],
 
   "modules-center": ["clock"],
 
   "modules-right": [
     "custom/music",
-    "custom/pomodoro",
     "bluetooth",
     "network",
     "pulseaudio", 
@@ -204,13 +204,5 @@
   "format" : ""
   },
 
-  "custom/pomodoro": {
-	"format": "{}",
-	"return-type": "json",
-	"exec": "waybar-module-pomodoro --no-work-icons",
-	"on-click": "waybar-module-pomodoro toggle",
-	"on-click-right": "waybar-module-pomodoro reset",
-  },
-
 }
 
diff --git a/.config/waybar/scripts/pomo-menu.sh b/.config/waybar/scripts/pomo-menu.sh
new file mode 100644
index 0000000..0a9afdc
--- /dev/null
+++ b/.config/waybar/scripts/pomo-menu.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+choice=$(printf "25 min work\n50 min work\nShort break (5)\nLong break (15)\nStop timer" |
+    wofi --dmenu --prompt "Pomodoro")
+
+case "$choice" in
+    "25 min work") waybar-module-pomodoro work -w 25 ;;
+    "50 min work") waybar-module-pomodoro work -w 50 ;;
+    "Short break (5)") waybar-module-pomodoro break -s 5 ;;
+    "Long break (15)") waybar-module-pomodoro break -l 15 ;;
+    "Stop timer") waybar-module-pomodoro reset ;;
+esac
+
diff --git a/.config/waybar/scripts/waybar_timer b/.config/waybar/scripts/waybar_timer
new file mode 100755
index 0000000..3d177f3
Binary files /dev/null and b/.config/waybar/scripts/waybar_timer differ