diff --git a/.config/autostart/discord.desktop b/.config/autostart/discord.desktop
deleted file mode 100644
index 0b1141a1..00000000
--- a/.config/autostart/discord.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Discord
-Comment=All-in-one voice and text chat for gamers that's free, secure, and works on both your desktop and phone.
-Exec=/usr/bin/discord
-Icon=discord
-StartupNotify=false
-Terminal=false
-Type=Application
-Path=
diff --git a/.config/autostart/easyeffects-service.desktop b/.config/autostart/easyeffects-service.desktop
deleted file mode 100644
index 7e0a009f..00000000
--- a/.config/autostart/easyeffects-service.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Easy Effects
-Comment=Efectos de sonido para las aplicaciones PipeWire
-Exec=easyeffects --gapplication-service
-Icon=com.github.wwmm.easyeffects
-StartupNotify=true
-Terminal=false
-Type=Application
-Path=
diff --git a/.config/autostart/spotify.desktop b/.config/autostart/spotify.desktop
deleted file mode 100644
index 1b626047..00000000
--- a/.config/autostart/spotify.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Spotify
-Comment=
-Exec=spotify --uri=%U
-Icon=spotify-client
-StartupNotify=false
-Terminal=false
-Type=Application
-Path=
diff --git a/.config/autostart/thunderbird-service.desktop b/.config/autostart/thunderbird-service.desktop
deleted file mode 100644
index 25a027b8..00000000
--- a/.config/autostart/thunderbird-service.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Thunderbird
-Comment=Lea y escriba correos y noticias con Thunderbird
-Exec=/usr/lib/thunderbird/thunderbird %u
-Icon=thunderbird
-StartupNotify=true
-Terminal=false
-Type=Application
-Path=
diff --git a/.config/hypr/scripts/autostart b/.config/hypr/scripts/autostart
index 391408b4..50e9d3cd 100755
--- a/.config/hypr/scripts/autostart
+++ b/.config/hypr/scripts/autostart
@@ -41,18 +41,16 @@ dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 dbus-update-activation-environment --systemd --all &
 systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP &
 
-# Launch tui monitors for cpu and gpu
-hyprctl dispatch exec "[workspace 24 silent] kitty btop" &
-hyprctl dispatch exec "[workspace 24 silent] kitty nvtop" &
-
-# Activity Watch
-# aw-server-rust &
-# aw-watcher-window-wayland &
-# aw-watcher-afk &
-
-#Launch autostart apps
-dex -a -s ~/.config/autostart/ & # Easyeffects, Spotify, Discord and Thunderbird
-
 # Screen sharing and portals
 "$scripts"/launch_portals &
 xwaylandvideobridge &
+
+# Apps
+easyeffects --gapplication-service &
+spotify &
+discord &
+thunderbird &
+
+# Terminal Apps
+kitty --class btop btop &
+kitty --class nvtop nvtop &
diff --git a/.config/hypr/themes/luna/rules.conf b/.config/hypr/themes/luna/rules.conf
index 1da8955e..387cd24b 100644
--- a/.config/hypr/themes/luna/rules.conf
+++ b/.config/hypr/themes/luna/rules.conf
@@ -35,6 +35,8 @@ windowrulev2 = workspace 8, class:^(.*Ryujinx.*)$|(.*cemu.*)$|(.*dolphin.*)$|(.*
 
 # Media
 windowrulev2 = workspace 23 silent, class:^(.*thunderbird.*)$
+windowrulev2 = workspace 24 silent, class:^(.*btop.*)$
+windowrulev2 = workspace 24 silent, class:^(.*nvtop.*)$
 windowrulev2 = workspace 21 silent, class:^(.*Spotify.*)$
 windowrulev2 = workspace 22 silent, class:^(.*discord.*)$
 windowrulev2 = workspace 17, class:^(.*obsproject.*)$