diff --git a/hyprland/.config/hypr/hyprland.conf b/hyprland/.config/hypr/hyprland.conf
index a1f4aa5..82a11d8 100644
--- a/hyprland/.config/hypr/hyprland.conf
+++ b/hyprland/.config/hypr/hyprland.conf
@@ -1,10 +1,12 @@
 monitor=eDP-1,2256x1504@60,0x0,1.175
 
-# Startup programs
-exec-once = waybar & firefox
-
+# Enviroment
 source = ~/.config/hypr/env.conf
 
+# Startup programs
+source = ~/.config/hypr/startup-all.conf
+source = ~/.config/hypr/startup-framework.conf
+
 # Default env vars
 env = XCURSOR_SIZE,24
 env = QT_QPA_PLATFORMTHEME,qt5ct
diff --git a/hyprland/.config/hypr/startup-all.conf b/hyprland/.config/hypr/startup-all.conf
new file mode 100644
index 0000000..a086b40
--- /dev/null
+++ b/hyprland/.config/hypr/startup-all.conf
@@ -0,0 +1,5 @@
+# Waybar
+exec-once = waybar
+
+# Password manager update
+exec-once = pass git pull
diff --git a/hyprland/.config/hypr/startup-framework.conf b/hyprland/.config/hypr/startup-framework.conf
new file mode 100644
index 0000000..befed2a
--- /dev/null
+++ b/hyprland/.config/hypr/startup-framework.conf
@@ -0,0 +1,2 @@
+exec-once = [workspace 1 silent] firefox
+exec-once = [workspace 2 silent] $terminal