diff --git a/config/hypr/UserConfigs/Startup_Apps.conf b/config/hypr/UserConfigs/Startup_Apps.conf
index 6d047dc..86e40ba 100644
--- a/config/hypr/UserConfigs/Startup_Apps.conf
+++ b/config/hypr/UserConfigs/Startup_Apps.conf
@@ -34,15 +34,11 @@ exec-once = wl-paste --type image --watch cliphist store
 # Rainbow borders
 exec-once = $UserScripts/RainbowBorders.sh
 
-# sway-idle with lock only
-exec-once = swayidle -w timeout 900 '$lock'
-# sway-idle with lock and sleep
-#exec-once = swayidle -w timeout 900 '$lock' timeout 1200 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep '$lock'
-# sway idle without lock
-#exec-once = swayidle -w  timeout 900 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on'
+# Starting hypridle to start hyprlock
+exec-once = hypridle
 
 # Here are list of features available but disabled by default
-#exec-once = swww query || swww-daemon --format xrgb && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png  # persistent wallpaper
+# exec-once = swww query || swww-daemon --format xrgb && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png  # persistent wallpaper
 
 #gnome polkit for nixos
 #exec-once = $scriptsDir/Polkit-NixOS.sh
diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index 6d13c8c..0340293 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -23,6 +23,7 @@ windowrule = center,^(pavucontrol)
 # windowrule v2
 windowrulev2 = workspace 1, class:^(thunderbird)$
 windowrulev2 = workspace 2, class:^(firefox)$
+windowrulev2 = workspace 2, class:^(org.mozilla.firefox)$
 windowrulev2 = workspace 2, class:^(Firefox-esr)$
 windowrulev2 = workspace 2, class:^(Microsoft-edge-beta)$ 
 windowrulev2 = workspace 3, class:^([Tt]hunar)$
@@ -39,6 +40,7 @@ windowrulev2 = opacity 0.9 0.6, class:^([Rr]ofi)$
 windowrulev2 = opacity 0.9 0.7, class:^(Brave-browser)$
 windowrulev2 = opacity 0.9 0.7, class:^(Brave-browser-dev)$
 windowrulev2 = opacity 0.9 0.7, class:^(firefox)$
+windowrulev2 = opacity 0.9 0.7, class:^(org.mozilla.firefox)$
 windowrulev2 = opacity 0.9 0.7, class:^(Firefox-esr)$
 windowrulev2 = opacity 0.9 0.8, class:^([Tt]hunar)$
 windowrulev2 = opacity 0.8 0.6, class:^(pcmanfm-qt)$
diff --git a/config/hypr/UserScripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh
index 16777f5..315bcf5 100755
--- a/config/hypr/UserScripts/RofiBeats.sh
+++ b/config/hypr/UserScripts/RofiBeats.sh
@@ -9,9 +9,11 @@ iDIR="$HOME/.config/swaync/icons"
 # Define menu options as an associative array
 declare -A menu_options=(
   ["Lofi Girl ☕️🎶"]="https://play.streamafrica.net/lofiradio"
-  ["96.3 Easy Rock 📻🎶"]="https://radio-stations-philippines.com/easy-rock"
-  ["Ghibli Music 🎻🎶"]="https://youtube.com/playlist?list=PLNi74S754EXbrzw-IzVhpeAaMISNrzfUy&si=rqnXCZU5xoFhxfOl"
+  ["Easy Rock 96.3 FM 📻🎶"]="https://radio-stations-philippines.com/easy-rock"
+  ["Wish 107.5 FM 📻🎶"]="https://radio-stations-philippines.com/dwnu-1075-wish"
+  ["Wish 107.5 YT Pinoy HipHop 🎻🎶"]="https://youtube.com/playlist?list=PLkrzfEDjeYJnmgMYwCKid4XIFqUKBVWEs&si=vahW_noh4UDJ5d37"
   ["Top Youtube Music 2023 ☕️🎶"]="https://youtube.com/playlist?list=PLDIoUOhQQPlXr63I_vwF9GD8sAKh77dWU&si=y7qNeEVFNgA-XxKy"
+  ["Wish 107.5 YT Wishclusives ☕️🎶"]="https://youtube.com/playlist?list=PLkrzfEDjeYJn5B22H9HOWP3Kxxs-DkPSM&si=d_Ld2OKhGvpH48WO"
   ["Chillhop ☕️🎶"]="http://stream.zeno.fm/fyn8eh3h5f8uv"
   ["SmoothChill ☕️🎶"]="https://media-ssl.musicradio.com/SmoothChill"
   ["Relaxing Music ☕️🎶"]="https://youtube.com/playlist?list=PLMIbmfP_9vb8BCxRoraJpoo4q1yMFg4CE"
diff --git a/config/hypr/hypridle.conf b/config/hypr/hypridle.conf
new file mode 100644
index 0000000..549f1b1
--- /dev/null
+++ b/config/hypr/hypridle.conf
@@ -0,0 +1,33 @@
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
+# Hypridle 
+# Original config submitted by https://github.com/SherLock707                                                       
+                                                      
+
+general {
+    # lock_cmd = notify-send "lock!"          # dbus/sysd lock command (loginctl lock-session) 
+    # unlock_cmd = notify-send "unlock!"      # same as above, but unlock
+    before_sleep_cmd = hyprlock    # command ran before sleep
+    # after_sleep_cmd = notify-send "Awake!"  # command ran after sleep
+    ignore_dbus_inhibit = false             # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam)
+}
+
+# Warn
+listener {
+    timeout = 540                            # 9 min
+    on-timeout = notify-send "You are idle!" # command to run when timeout has passed
+    on-resume = notify-send "Welcome back!"  # command to run when activity is detected after timeout has fired.
+}
+
+# Screenlock
+listener {
+    timeout = 600                     # 10 min
+    on-timeout = hyprlock # command to run when timeout has passed
+    # on-resume = notify-send "Welcome back to your desktop!"  # command to run when activity is detected after timeout has fired.
+}
+
+# Suspend # disabled by default
+# listener {
+   # timeout = 1200                            # 20 min
+   # on-timeout = systemctl suspend # command to run when timeout has passed
+    # on-resume = notify-send "Welcome back to your desktop!"  # command to run when activity is detected after timeout has fired.
+# }
diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
new file mode 100644
index 0000000..7e8c184
--- /dev/null
+++ b/config/hypr/hyprlock.conf
@@ -0,0 +1,132 @@
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
+# Hyprlock                                                          
+# Original config submitted by https://github.com/SherLock707
+
+source = $HOME/.cache/wal/colors-hyprland
+
+general {
+    grace = 1
+}
+
+background {
+    monitor =
+	path = screenshot   # screenshot of your desktop
+	# path = $HOME/.config/rofi/.current_wallpaper   # NOTE only png supported for now
+    color = $color7
+
+    # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
+    blur_size = 4
+    blur_passes = 2 # 0 disables blurring
+    noise = 0.0117
+    contrast = 1.3000 # Vibrant!!!
+    brightness = 0.8000
+    vibrancy = 0.2100
+    vibrancy_darkness = 0.0
+}
+
+input-field {
+    monitor =
+    size = 250, 50
+    outline_thickness = 3
+    dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8
+    dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0
+    dots_center = true
+    outer_color = $color1
+    inner_color = $color0
+    font_color = $color7
+    fade_on_empty = true
+    placeholder_text = <i>Password...</i> # Text rendered in the input box when it's empty.
+    hide_input = false
+    
+    position = 0, 100
+    halign = center
+    valign = bottom
+}
+
+# Date
+label {
+    monitor =
+    text = cmd[update:18000000] echo "<b> "$(date +'%A, %-d %B %Y')" </b>"
+    color = $color5
+    font_size = 34
+    font_family = JetBrains Mono Nerd Font 10
+
+    position = 0, -150
+    halign = center
+    valign = top
+}
+
+# Week
+label {
+    monitor =
+    text = cmd[update:18000000] echo "<b> "$(date +'Week %U')" </b>"
+    color = $color7
+    font_size = 24
+    font_family = JetBrains Mono Nerd Font 10
+
+    position = 0, -225
+    halign = center
+    valign = top
+}
+
+# Time
+label {
+    monitor =
+# text = cmd[update:1000] echo "<b><big> $(date +"%I:%M:%S %p") </big></b>" # AM/PM
+text = cmd[update:1000] echo "<b><big> $(date +"%H:%M:%S") </big></b>" # 24H
+    color = $color7
+    font_size = 94
+    font_family = JetBrains Mono Nerd Font 10
+
+    position = 0, -150
+    halign = center
+    valign = center
+}
+
+label {
+    monitor =
+    text =    $USER
+    color = $color7
+    font_size = 18
+    font_family = Inter Display Medium
+
+    position = 0, 200
+    halign = center
+    valign = bottom
+}
+
+label {
+    monitor =
+    text = cmd[update:60000] echo "<b> "$(uptime -p)" </b>"
+    color = $color12
+    font_size = 24
+    font_family = JetBrains Mono Nerd Font 10
+    position = 0, 0
+    halign = right
+    valign = bottom
+}
+
+label {
+    monitor =
+    text = cmd[update:3600000] ping -c 1 wttr.in > /dev/null && curl -s 'wttr.in?format=2' # For specific location : wttr.in/busan?format=2
+    color = $color10
+    font_size = 24
+    font_family = JetBrains Mono Nerd Font 10
+    position = 50, 0
+    halign = left
+    valign = bottom
+}
+
+image {
+    monitor =
+    path = $HOME/.config/rofi/.current_wallpaper
+    size = 230
+    rounding = -1
+    border_size = 4
+    border_color = $color12
+    rotate = 0
+    reload_time = -1
+    position = 0, 200
+    halign = center
+    valign = center
+}
\ No newline at end of file
diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh
index 15fae8c..b6c57f3 100755
--- a/config/hypr/initial-boot.sh
+++ b/config/hypr/initial-boot.sh
@@ -20,7 +20,7 @@ if [ ! -f ~/.config/hypr/.initial_startup_done ]; then
     # Initialize pywal and wallpaper
 	if [ -f "$wallpaper" ]; then
 		wal -i $wallpaper -s -t > /dev/null 
-		swww-daemon --format xrgb && $swww $wallpaper $effect
+		swww query || swww-daemon && $swww $wallpaper $effect
 	    "$scriptsDir/PywalSwww.sh" > /dev/null 2>&1 & 
 	fi
      
diff --git a/config/hypr/scripts/LockScreen.sh b/config/hypr/scripts/LockScreen.sh
index bf9fcf5..56d496a 100755
--- a/config/hypr/scripts/LockScreen.sh
+++ b/config/hypr/scripts/LockScreen.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
-# For Swaylock
 
-CONFIG="$HOME/.config/swaylock/config"
-
-sleep 0.5s; swaylock --config ${CONFIG} & disown
+# For Hyprlock
+hyprlock -q
\ No newline at end of file
diff --git a/config/hypr/scripts/TouchPad.sh b/config/hypr/scripts/TouchPad.sh
index c5722c1..e94ee06 100755
--- a/config/hypr/scripts/TouchPad.sh
+++ b/config/hypr/scripts/TouchPad.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # For disabling touchpad.
+# Edit the Touchpad_Device according to your system
+# use hyprctl devices to get your system touchpad device name
+
 
 Touchpad_Device="asue1209:00-04f3:319f-touchpad"
 notif="$HOME/.config/swaync/images/bell.png"
diff --git a/config/hypr/v2.2.7 b/config/hypr/v2.2.8
similarity index 100%
rename from config/hypr/v2.2.7
rename to config/hypr/v2.2.8
diff --git a/config/waybar/configs/[TOP] Minimal - Long b/config/waybar/configs/[TOP] Minimal - Long
index 52e16fd..143f22d 100644
--- a/config/waybar/configs/[TOP] Minimal - Long	
+++ b/config/waybar/configs/[TOP] Minimal - Long	
@@ -27,6 +27,7 @@
 	],
 "modules-center": [
 	"clock",
+	"idle_inhibitor",
 	],
 "modules-right": [
 	"group/motherboard",
diff --git a/config/waybar/style/Half-Moon.css b/config/waybar/style/Half-Moon.css
new file mode 100644
index 0000000..3fa290d
--- /dev/null
+++ b/config/waybar/style/Half-Moon.css
@@ -0,0 +1,201 @@
+/* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
+/* ....................................*/
+/* ..........Half Moon.................. */
+/* NOTE: This is only for some waybar configs */
+/* --- 👍 shared by https://github.com/TomekBobrowicz  👍 --- */
+
+* {
+font-size: 97%;
+font-family: JetBrainsMono Nerd Font, Font Awesome, sans-serif;
+font-weight: bold;
+}
+window#waybar {
+  background-color: rgba(26,27,38,0);
+  border-bottom: 1px solid rgba(26,27,38,0);
+  border-radius: 0px;
+  color: #E6B673;
+
+  }
+#workspaces {
+  background: #0F1419;
+  margin: 5px;
+  padding: 0px 1px;
+  border-radius: 15px;
+  border: 0px;
+  font-style: normal;
+  color: #0F1419;
+
+  }
+#workspaces button {
+	  padding: 0px 5px;
+  margin: 4px 3px;
+  border-radius: 15px;
+  border: 0px;
+  color: #0F1419;
+  background: linear-gradient(45deg, #95E6CB, #59C2FF, #D2A6FF);
+  opacity: 0.5;
+  transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+
+  }
+#workspaces button.active {
+  padding: 0px 5px;
+  margin: 4px 3px;
+  border-radius: 15px;
+  border: 0px;
+  color: #0F1419;
+  background: linear-gradient(45deg, #59C2FF, #D2A6FF);
+  opacity: 1.0;
+  min-width: 40px;
+  transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+  }
+#workspaces button:hover {
+  border-radius: 15px;
+  color: #0F1419;
+  background: linear-gradient(45deg, #59C2FF, #D2A6FF);
+  opacity: 0.8;
+  transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+
+  }
+@keyframes gradient_horizontal {
+0% {
+  background-position: 0% 50%;
+}
+50% {
+  background-position: 100% 50%;
+}
+100% {
+  background-position: 0% 50%;
+}
+  }
+  @keyframes swiping {
+    0% {
+  background-position: 0% 200%;
+}
+100% {
+  background-position: 200% 200%;
+}
+  }
+  tooltip {
+background: #0F1419;
+border: 1px solid #D2A6FF;
+border-radius: 10px;
+  }
+  tooltip label {
+color: #F3F4F5;
+  }
+  #window {
+	  color: #E6E1CF;
+  background: #0F1419;
+  border-radius: 50px 15px 50px 15px;
+  margin: 5px;
+  padding: 2px 20px;
+
+  }
+  #temperature,
+  #memory {
+color: #E6B673;
+	  background: #0F1419;
+  border-radius: 50px 15px 50px 15px;
+  margin: 5px;
+  padding: 2px 20px;
+
+  }
+
+  #custom-swaync,
+  #idle_inhibitor,
+  #clock {
+	color: #B8CC52;
+	  background: #0F1419;
+  border-radius: 15px 50px 15px 50px;
+  margin: 5px;
+  padding: 2px 20px;
+
+  }
+  #cpu {
+	color: #F3F4F5;
+	  background: #0F1419;
+  border-radius: 50px 15px 50px 15px;
+  margin: 5px;
+  padding: 2px 20px;
+
+  }
+  #disk {
+	color: #B8CC52;
+	  background: #0F1419;
+  border-radius: 50px 15px 50px 15px;
+  margin: 5px;
+  padding: 2px 20px;
+
+  }
+  #battery {
+	color: #F07178;
+	  background: #0F1419;
+  border-radius: 15px 50px 15px 50px;
+  margin: 5px;
+  padding: 2px 20px;
+
+  }
+  #network {
+	color: #FF8F40;
+	  background: #0F1419;
+  border-radius: 50px 15px 50px 15px;
+  margin: 5px;
+  padding: 2px 20px;
+
+  }
+  #custom-hyprbindings {
+  color: #D2A6FF;
+	  background: #0F1419;
+  border-radius: 15px 50px 15px 50px;
+  margin: 5px;
+  padding: 2px 20px;
+
+  }
+  #tray {
+	color: #E6E1CF;
+	  background: #0F1419;
+  border-radius: 15px 30px 30px 50px;
+  margin: 5px 0px 5px 5px;
+  padding: 2px 20px;
+
+  }
+  #pulseaudio {
+	color: #59C2FF;
+	  background: #0F1419;
+  border-radius: 50px 15px 50px 15px;
+  margin: 5px;
+  padding: 2px 20px;
+
+  }
+  #custom-notification {
+	color: #95E6CB;
+	  background: #0F1419;
+  border-radius: 15px 50px 15px 50px;
+  margin: 5px;
+  padding: 2px 20px;
+
+  }
+  #custom-weather {
+	color: #59C2FF;
+	  background: #0F1419;
+  border-radius: 0px 50px 15px 0px;
+  margin: 5px 0px;
+  padding: 2px 15px 2px 5px;
+
+  }
+  #custom-menu {
+	color: #59C2FF;
+	  background: #0F1419;
+  border-radius: 0px 15px 50px 0px;
+  margin: 5px 5px 5px 0px;
+  padding: 1px 15px;
+
+  }
+  #custom-power {
+	color: #D2A6FF;
+	  background: #0F1419;
+  border-radius: 15px 0px 0px 50px;
+  margin: 5px 0px;
+  padding: 2px 5px 2px 15px;
+
+  } 
diff --git a/config/wlogout/layout b/config/wlogout/layout
index c873650..ea46874 100644
--- a/config/wlogout/layout
+++ b/config/wlogout/layout
@@ -24,13 +24,13 @@
 }
 {
     "label" : "suspend",
-    "action" : "swaylock -f && systemctl suspend",
+    "action" : "systemctl suspend",
     "text" : "Suspend",
     "keybind" : "u"
 }
 {
     "label" : "hibernate",
-    "action" : "swaylock -f && systemctl hibernate",
+    "action" : "systemctl hibernate",
     "text" : "Hibernate",
     "keybind" : "h"
 }
\ No newline at end of file
diff --git a/copy.sh b/copy.sh
index 7b513a9..d3df387 100755
--- a/copy.sh
+++ b/copy.sh
@@ -113,6 +113,45 @@ done
 
 printf "\n"
 
+# Ask whether to change to 12hr format
+while true; do
+  echo -e "$ORANGE By default, configs are in 24H format."
+  read -p "$CAT Do you want to change to 12H format (AM/PM)? (y/n): " answer
+
+  # Convert the answer to lowercase for comparison
+  answer=$(echo "$answer" | tr '[:upper:]' '[:lower:]')
+
+  # Check if the answer is valid
+  if [[ "$answer" == "y" ]]; then
+    # Modify waybar config if 12hr is selected
+    sed -i 's/^    \/\/"format": " {:%I:%M %p}"/    "format": " {:%I:%M %p}"/' ./config/waybar/modules
+    sed -i 's/^    "format": " {:%H:%M:%S}"/    \/\/"format": " {:%H:%M:%S}"/' ./config/waybar/modules
+    
+    # for hyprlock
+    sed -i 's|^# text = cmd\[update:1000\] echo "<b><big> $(date +"%I:%M:%S %p") </big></b>" # AM/PM|text = cmd\[update:1000\] echo "<b><big> $(date +"%I:%M:%S %p") </big></b>" # AM/PM|' ./config/hypr/hyprlock.conf
+    sed -i 's|^text = cmd\[update:1000\] echo "<b><big> $(date +"%H:%M:%S") </big></b>" # 24H|# text = cmd\[update:1000\] echo "<b><big> $(date +"%H:%M:%S") </big></b>" # 24H|' ./config/hypr/hyprlock.conf
+
+    # for SDDM (custom theme)
+    sddm_folder="/usr/share/sddm/themes/simple-sddm"
+    if [ -d "$sddm_folder" ]; then
+      echo "Simple sddm exists. Editing to 12H format"
+
+      sudo sed -i 's|^## HourFormat="hh:mm AP"|HourFormat="hh:mm AP"|' "$sddm_folder/theme.conf"
+      sudo sed -i 's|^HourFormat="HH:mm"|## HourFormat="HH:mm"|' "$sddm_folder/theme.conf"
+
+      echo "12H format set to SDDM theme successfully."
+    fi
+    break
+  elif [[ "$answer" == "n" ]]; then
+    echo "You chose not to change to 12H format."
+    break
+  else
+    echo "Invalid choice. Please enter y for yes or n for no."
+  fi
+done
+
+printf "\n"
+
 # Action to do for better rofi appearance
 while true; do
     echo "$ORANGE Select monitor resolution for better Rofi appearance:"