diff --git a/config/hypr/configs/Execs.conf b/config/hypr/configs/Execs.conf
index 098db4b..19da05b 100644
--- a/config/hypr/configs/Execs.conf
+++ b/config/hypr/configs/Execs.conf
@@ -22,10 +22,10 @@ exec-once = $scriptsDir/Polkit.sh
 
 # starup apps
 exec-once = waybar &
-# exec-once = dunst &
 exec-once swaync &
-#exec-once = blueman-applet & 
 exec-once = nm-applet --indicator &
+# exec-once = dunst &
+#exec-once = blueman-applet & 
 #exec-once = rog-control-center &
 
 #clipboard manager
diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index 4e6a753..901cbd2 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -34,6 +34,8 @@ bind = $mainMod SHIFT, G, exec, $scriptsDir/GameMode.sh # animations ON/OFF
 bind = $mainMod ALT, K, exec, $scriptsDir/SwitchKeyboardLayout.sh # Switch Keyboard Layout
 bind = $mainMod, Space, exec, $scriptsDir/ChangeLayout.sh # Toggle Master or Dwindle Layout
 bind = $mainMod ALT, V, exec, $scriptsDir/ClipManager.sh # Clipboard Manager
+bind = $mainMod SHIFT, N, exec, swaync-client -t -sw # swayNC panel
+
 
 # MISC (Miscellaneous Keybinds)
 bind = $mainMod SHIFT, O, exec, $scriptsDir/ZshChangeTheme.sh # Change oh-my-zsh theme
@@ -179,6 +181,3 @@ bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" - | swappy -f -
 # to unbind
 #bind = $mainMod ALT, P, submap, reset
 #submap = reset
-
-#Swaync notification panel
-bind = $mainMod, N, exec, swaync-client -t -sw
\ No newline at end of file
diff --git a/config/hypr/scripts/KeyHints.sh b/config/hypr/scripts/KeyHints.sh
index 7bb80e1..a9d93d0 100755
--- a/config/hypr/scripts/KeyHints.sh
+++ b/config/hypr/scripts/KeyHints.sh
@@ -45,13 +45,15 @@ yad --width=$dynamic_width --height=$dynamic_height \
 " Alt V" "Clipboard Manager" "(cliphist)" \
 " W" "Choose wallpaper" "(swww)" \
 "CTRL ALT W" "Random wallpaper" "(swww)" \
-" CTRL B" "Choose waybar styles" "(waybar styles)" \
 " B" "Hide/UnHide Waybar" "waybar" \
+" CTRL B" "Choose waybar styles" "(waybar styles)" \
 " ALT B" "Choose waybar layout" "(waybar layout)" \
-" ALT R" "Reload Waybar Dunst Rofi" "" \
+" ALT R" "Reload Waybar swaync Rofi" "CHECK NOTIFICATION FIRST!!!" \
+" SHIFT N" "Launch Notification Pannel" "SwayNC Control Center" \
 " Print" "screenshot" "(grim)" \
 " Shift Print" "screenshot region" "(grim + slurp)" \
 " Shift S" "screenshot region" "(swappy)" \
+"ALT Print" "Screenshot active window" "active window only" \
 "CTRL ALT P" "power-menu" "(wlogout)" \
 "CTRL ALT L" "screen lock" "(swaylock)" \
 "CTRL ALT Del" "Hyprland Exit" "(SAVE YOUR WORK!!!)" \
diff --git a/config/hypr/scripts/PywalSwaync.sh b/config/hypr/scripts/PywalSwaync.sh
deleted file mode 100755
index aad1acb..0000000
--- a/config/hypr/scripts/PywalSwaync.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-pkill swaync
-
-sleep 0.3
-swaync > /dev/null 2>&1 &
\ No newline at end of file
diff --git a/config/hypr/scripts/Refresh.sh b/config/hypr/scripts/Refresh.sh
index dd773ef..3838b5e 100755
--- a/config/hypr/scripts/Refresh.sh
+++ b/config/hypr/scripts/Refresh.sh
@@ -3,7 +3,7 @@
 SCRIPTSDIR=$HOME/.config/hypr/scripts
 
 # Kill already running processes
-_ps=(waybar rofi)
+_ps=(waybar rofi swaync)
 for _prs in "${_ps[@]}"; do
     if pidof "${_prs}" >/dev/null; then
         pkill "${_prs}"
@@ -14,12 +14,9 @@ sleep 0.1
 # Relaunch waybar
 waybar &
 
-sleep 0.1
-# Relaunch dunst with pywal-borders
-# ${SCRIPTSDIR}/PywalDunst.sh &
-
-# Relaunch swaync with pywal-borders
-${SCRIPTSDIR}/PywalSwaync.sh
+# relaunch swaync
+sleep 0.3
+swaync > /dev/null 2>&1 &
 
 # Relaunching rainbow borders
 sleep 1
diff --git a/config/hypr/scripts/RefreshNoWaybar.sh b/config/hypr/scripts/RefreshNoWaybar.sh
index c834a53..0b74f01 100755
--- a/config/hypr/scripts/RefreshNoWaybar.sh
+++ b/config/hypr/scripts/RefreshNoWaybar.sh
@@ -19,7 +19,7 @@ ${SCRIPTSDIR}/PywalSwww.sh &
 
 sleep 0.5
 # Relaunch dunst with pywal-borders
-${SCRIPTSDIR}/PywalDunst.sh &
+#${SCRIPTSDIR}/PywalDunst.sh &
 
 # Relaunching rainbow borders
 sleep 1
diff --git a/config/hypr/scripts/ScreenShot.sh b/config/hypr/scripts/ScreenShot.sh
index 0682627..44ba2bd 100755
--- a/config/hypr/scripts/ScreenShot.sh
+++ b/config/hypr/scripts/ScreenShot.sh
@@ -1,27 +1,40 @@
 #!/bin/bash
 
 iDIR="$HOME/.config/dunst/icons"
+notify_cmd_shot="dunstify -h string:x-canonical-private-synchronous:shot-notify -u low -i ${iDIR}/picture.png"
 
-time=$(date +%Y-%m-%d-%H-%M-%S)
+time=$(date "+%d-%b_%H-%M-%S")
 dir="$(xdg-user-dir)/Pictures/Screenshots"
 file="Screenshot_${time}_${RANDOM}.png"
 
+active_window_class=$(hyprctl -j activewindow | jq -r '(.class)')
+active_window_file="Screenshot_${time}_${active_window_class}.png"
+active_window_path="${dir}/${active_window_file}"
+
 # notify and view screenshot
-notify_cmd_shot="notify-send -h string:x-canonical-private-synchronous:shot-notify -u low -i ${iDIR}/picture.png"
 notify_view() {
-	${notify_cmd_shot} "Copied to clipboard."
-##	viewnior ${dir}/"$file"
-	if [[ -e "$dir/$file" ]]; then
-		${notify_cmd_shot} "Screenshot Saved."
-	else
-		${notify_cmd_shot} "Screenshot Deleted."
-	fi
+    if [[ "$1" == "active" ]]; then
+        if [[ -e "${active_window_path}" ]]; then
+            ${notify_cmd_shot} "Screenshot of '${active_window_class}' is saved."
+        else
+            ${notify_cmd_shot} "Screenshot of '${active_window_class}' is deleted or not available."
+        fi
+    else
+        local check_file="$dir/$file"
+        if [[ -e "$check_file" ]]; then
+            ${notify_cmd_shot} "Screenshot Saved."
+        else
+            ${notify_cmd_shot} "Screenshot Deleted."
+        fi
+    fi
 }
 
+
+
 # countdown
 countdown() {
 	for sec in $(seq $1 -1 1); do
-		notify-send -h string:x-canonical-private-synchronous:shot-notify -t 1000 -i "$iDIR"/timer.png "Taking shot in : $sec"
+		dunstify -h string:x-canonical-private-synchronous:shot-notify -t 1000 -i "$iDIR"/timer.png "Taking shot in : $sec"
 		sleep 1
 	done
 }
@@ -59,6 +72,17 @@ shotarea() {
 	notify_view
 }
 
+shotactive() {
+    active_window_class=$(hyprctl -j activewindow | jq -r '(.class)')
+    active_window_file="Screenshot_${time}_${active_window_class}.png"
+    active_window_path="${dir}/${active_window_file}"
+
+    hyprctl -j activewindow | jq -r '"\(.at[0]),\(.at[1]) \(.size[0])x\(.size[1])"' | grim -g - "${active_window_path}"
+	sleep 1
+    notify_view "active"  
+}
+
+
 if [[ ! -d "$dir" ]]; then
 	mkdir -p "$dir"
 fi
@@ -73,8 +97,10 @@ elif [[ "$1" == "--win" ]]; then
 	shotwin
 elif [[ "$1" == "--area" ]]; then
 	shotarea
+elif [[ "$1" == "--active" ]]; then
+	shotactive
 else
-	echo -e "Available Options : --now --in5 --in10 --win --area"
+	echo -e "Available Options : --now --in5 --in10 --win --area --active"
 fi
 
 exit 0
diff --git a/config/swaync/config.json b/config/swaync/config.json
index 1f9de0e..591757b 100644
--- a/config/swaync/config.json
+++ b/config/swaync/config.json
@@ -1,78 +1,93 @@
 {
-  "$schema": "/etc/xdg/swaync/configSchema.json",
-  "positionX": "right",
-  "positionY": "top",
-  "layer": "overlay",
-  "control-center-layer": "top",
-  "layer-shell": true,
-  "cssPriority": "application",
-  "control-center-margin-top": 0,
-  "control-center-margin-bottom": 0,
-  "control-center-margin-right": 0,
-  "control-center-margin-left": 0,
-  "notification-2fa-action": true,
-  "notification-inline-replies": false,
-  "notification-icon-size": 64,
-  "notification-body-image-height": 100,
-  "notification-body-image-width": 200,
-  "timeout": 10,
-  "timeout-low": 5,
-  "timeout-critical": 0,
-  "fit-to-screen": true,
-  "control-center-width": 500,
-  "control-center-height": 600,
-  "notification-window-width": 500,
-  "keyboard-shortcuts": true,
-  "image-visibility": "when-available",
-  "transition-time": 200,
-  "hide-on-clear": false,
-  "hide-on-action": true,
-  "script-fail-notify": true,
-  // "scripts": {
-  //   "example-script": {
-  //     "exec": "echo 'Do something...'",
-  //     "urgency": "Normal"
-  //   },
-  //   "example-action-script": {
-  //     "exec": "echo 'Do something actionable!'",
-  //     "urgency": "Normal",
-  //     "run-on": "action"
-  //   }
-  // },
-  "notification-visibility": {
-    "example-name": {
-      "state": "muted",
-      "urgency": "Low",
-      "app-name": "mpv"
+    "$schema": "/etc/xdg/swaync/configSchema.json",
+    "positionX": "right",
+    "positionY": "top",
+    "control-center-margin-top": 10,
+    "control-center-margin-bottom": 10,
+    "control-center-margin-right": 10,
+    "control-center-margin-left": 10,
+    "notification-icon-size": 24,
+    "notification-body-image-height": 60,
+    "notification-body-image-width": 300,
+    "timeout": 6,
+    "timeout-low": 3,
+    "timeout-critical": 0,
+    "fit-to-screen": false,
+    "control-center-width": 400,
+    "control-center-height": 800,
+    "notification-window-width": 300,
+    "keyboard-shortcuts": true,
+    "image-visibility": "when-available",
+    "transition-time": 200,
+    "hide-on-clear": false,
+    "hide-on-action": true,
+    "script-fail-notify": true,
+    "widgets": [
+        "title",
+        "buttons-grid",
+        "dnd",
+    		"volume",
+   	 		"backlight",
+        "notifications"
+    ],
+    "widget-config": {
+        "title": {
+            "text": "Control Center",
+            "clear-all-button": true,
+            "button-text": "Clear"
+        },
+        "dnd": {
+            "text": "Do Not Disturb"
+        },
+        "label": {
+            "max-lines": 1,
+            "text": "Control Center"
+        },
+        "mpris": {
+            "image-size": 60,
+            "image-radius": 7
+        },
+        "volume": {
+            "label": "󰕾"
+        },
+        "backlight": {
+            "label": "󰃟"
+        },
+        "buttons-grid": {
+            "actions": [
+                {
+                    "label": "󰐥",
+                    "command": "systemctl poweroff"
+                },
+                {
+                    "label": "󰜉",
+                    "command": "systemctl reboot"
+                },
+                {
+                    "label": "󰌾",
+                    "command": "~/.config/hypr/scripts/LockScreen.sh"
+                },
+                {
+                    "label": "󰍃",
+                    "command": "hyprctl dispatch exit"
+                },
+                {
+                    "label": "󰀝",
+                    "command": "~/.config/hypr/scripts/AirplaneMode.sh"
+                },
+                {
+                    "label": "󰕾",
+                    "command": "pactl set-sink-mute @DEFAULT_SINK@ toggle"
+                },
+                {
+                    "label": "󰍬",
+                    "command": "pactl set-source-mute @DEFAULT_SOURCE@ toggle"
+                },
+                {
+                    "label": "󰂯",
+                    "command": "blueman-manager"
+                }
+            ]
+        }
     }
-  },
-  "widgets": [
-    "inhibitors",
-    "title",
-    "dnd",
-    "notifications"
-  ],
-  "widget-config": {
-    "inhibitors": {
-      "text": "Inhibitors",
-      "button-text": "Clear All",
-      "clear-all-button": true
-    },
-    "title": {
-      "text": "Notifications",
-      "clear-all-button": true,
-      "button-text": "Clear All"
-    },
-    "dnd": {
-      "text": "Do Not Disturb"
-    },
-    "label": {
-      "max-lines": 5,
-      "text": "Label Text"
-    },
-    "mpris": {
-      "image-size": 96,
-      "image-radius": 12
-    }
-  }
-}
+}
\ No newline at end of file
diff --git a/config/swaync/style.css b/config/swaync/style.css
index 13d8c0b..e65c2db 100644
--- a/config/swaync/style.css
+++ b/config/swaync/style.css
@@ -1,296 +1,332 @@
 @import '../../.cache/wal/colors-waybar.css';
 
-@define-color foreground rgb(248, 248, 242);
-@define-color background @color1;
-/* @define-color background rgb(40, 42, 54); */
-@define-color background-alpha rgba(40, 42, 54, 0.8);
-@define-color accent @color2;
-/* @define-color accent rgba(189, 147, 249, 0.8); */
-@define-color current-line rgb(68, 71, 90);
-@define-color comment rgb(98, 114, 164);
+@define-color cc-bg rgba(26, 27, 38, 1);
+@define-color noti-border-color @color2;
+@define-color noti-bg @background;
+@define-color noti-bg-darker rgb(43, 43, 57);
+@define-color noti-bg-hover @color2;
+@define-color noti-bg-focus rgba(27, 27, 27, 0.6);
+@define-color noti-close-bg rgba(255, 255, 255, 0.1);
+@define-color noti-close-bg-hover rgba(255, 255, 255, 0.15);
+@define-color text-color @foreground;
+@define-color text-color-disabled rgb(150, 150, 150);
+@define-color bg-selected rgb(0, 128, 255);
 
 * {
-  all: unset;
-  font-size: 18px;
-  /* font-family: "JetBrainsMono Nerd Font"; */
-  transition: 200ms;
+    font-family: JetBrainsMono NFP;
+    font-weight: bold;
 }
 
-.floating-notifications.background .notification-row .notification-background {
-  box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.8), inset 0 0 0 1px #313244;
-  border-radius: 12.6px;
-  margin: 18px;
-  /* background-color: #1e1e2e; */
-  background-color: rgba(30, 30, 46, 0.9);
-  color: #cdd6f4;
-  padding: 3;
-  border: 1px solid @accent;
+.control-center .notification-row:focus,
+.control-center .notification-row:hover {
+    opacity: 1;
+    background: @noti-bg
 }
 
-.floating-notifications.background .notification-row .notification-background .notification {
-  padding: 7px;
-  border-radius: 12.6px;
+.notification-row {
+    outline: none;
+    margin: 10px;
+    padding: 0;
 }
 
-.floating-notifications.background .notification-row .notification-background .notification.critical {
-  box-shadow: inset 0 0 7px 0 #f38ba8;
+.notification {
+    background: transparent;
+    padding: 0px;
+    margin: 0px;
 }
 
-.floating-notifications.background .notification-row .notification-background .notification .notification-content {
-  margin: 7px;
+.notification-content {
+    background: @cc-bg;
+    padding: 2px;
+    border-radius: 5px;
+    border: 2px solid @noti-border-color;
+    margin: 0;
 }
 
-.floating-notifications.background .notification-row .notification-background .notification .notification-content .summary {
-  color: #cdd6f4;
+.notification-default-action {
+    margin: 0;
+    padding: 0;
+    border-radius: 5px;
 }
 
-.floating-notifications.background .notification-row .notification-background .notification .notification-content .time {
-  color: #a6adc8;
+.close-button {
+    background: #f7768e;
+    color: @cc-bg;
+    text-shadow: none;
+    padding: 0;
+    border-radius: 5px;
+    margin-top: 5px;
+    margin-right: 5px;
 }
 
-.floating-notifications.background .notification-row .notification-background .notification .notification-content .body {
-  color: #cdd6f4;
+.close-button:hover {
+    box-shadow: none;
+    background: #f7768e;
+    transition: all .15s ease-in-out;
+    border: none
 }
 
-.floating-notifications.background .notification-row .notification-background .notification > *:last-child > * {
-  min-height: 3.4em;
+
+.notification-action {
+    border: 2px solid @noti-border-color;
+    border-top: none;
+    border-radius: 8px;
 }
 
-.floating-notifications.background .notification-row .notification-background .notification > *:last-child > * .notification-action {
-  border-radius: 7px;
-  color: #cdd6f4;
-  background-color: #313244;
-  box-shadow: inset 0 0 0 1px #45475a;
-  margin: 7px;
+
+.notification-default-action:hover,
+.notification-action:hover {
+    color: @foreground;
+    background: #7aa2f7
 }
 
-.notification-action {
-  border-radius: 5px;
-  background: linear-gradient(
-    45deg,
-    rgba(164, 89, 235, 0.8),
-    @accent
-  );
-  border: 1px;
-  margin: 5px;
+.notification-default-action {
+    border-radius: 5px;
+    margin: 0px;
 }
 
-.floating-notifications.background .notification-row .notification-background .notification > *:last-child > * .notification-action:hover {
-  box-shadow: inset 0 0 0 1px #45475a;
-  background-color: #313244;
-  color: #cdd6f4;
+.notification-default-action:not(:only-child) {
+    border-bottom-left-radius: 7px;
+    border-bottom-right-radius: 7px
 }
 
-.floating-notifications.background .notification-row .notification-background .notification > *:last-child > * .notification-action:active {
-  box-shadow: inset 0 0 0 1px #45475a;
-  background-color: #74c7ec;
-  color: #cdd6f4;
+.notification-action:first-child {
+    border-bottom-left-radius: 10px;
+    background: #1b1b2b
 }
 
-.floating-notifications.background .notification-row .notification-background .close-button {
-  margin: 7px;
-  padding: 2px;
-  border-radius: 6.3px;
-  color: #1e1e2e;
-  background-color: #f38ba8;
+.notification-action:last-child {
+    border-bottom-right-radius: 10px;
+    background: #1b1b2b
 }
 
-.floating-notifications.background .notification-row .notification-background .close-button:hover {
-  background-color: #eba0ac;
-  color: #1e1e2e;
+.inline-reply {
+    margin-top: 8px
 }
 
-.floating-notifications.background .notification-row .notification-background .close-button:active {
-  background-color: #f38ba8;
-  color: #1e1e2e;
+.inline-reply-entry {
+    background: @noti-bg;
+    color: @text-color;
+    caret-color: @text-color;
+    border: 1px solid @noti-border-color;
+    border-radius: 8px
 }
 
-.control-center {
-  box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.8), inset 0 0 0 1px #313244;
-  border-radius: 12.6px;
-  margin: 18px;
-  /* background-color: #1e1e2e; */
-  background-color: rgba(49, 50, 68, 0.9);
-  color: #cdd6f4;
-  padding: 14px;
-  border: 1px solid @accent;
+.inline-reply-button {
+		font-size: 0.5rem;
+    margin-left: 4px;
+    background: @noti-bg;
+    border: 1px solid @noti-border-color;
+    border-radius: 5px;
+    color: @text-color
+}
+
+.inline-reply-button:disabled {
+    background: initial;
+    color: @text-color-disabled;
+    border: 1px solid transparent
+}
+
+.inline-reply-button:hover {
+    background: @noti-bg-hover
 }
 
-.control-center .widget-title {
-  color: #cdd6f4;
-  font-size: 1.3em;
+.body-image {
+    margin-top: 6px;
+    background-color: #fff;
+    border-radius: 5px
 }
 
-.control-center .widget-title button {
-  border-radius: 7px;
-  color: #cdd6f4;
-  background-color: #313244;
-  box-shadow: inset 0 0 0 1px #45475a;
-  padding: 8px;
+.summary {
+    font-size: 1rem;
+    font-weight: 700;
+    background: transparent;
+    color: rgba(158, 206, 106, 1);
+    text-shadow: none
 }
 
-.control-center .widget-title button:hover {
-  box-shadow: inset 0 0 0 1px #45475a;
-  background-color: #585b70;
-  color: #cdd6f4;
+.time {
+    font-size: 1rem;
+    font-weight: 700;
+    background: transparent;
+    color: @text-color;
+    text-shadow: none;
+    margin-right: 18px
 }
 
-.control-center .widget-title button:active {
-  box-shadow: inset 0 0 0 1px #45475a;
-  background-color: #74c7ec;
-  color: #1e1e2e;
+.body {
+    font-size: 1rem;
+    font-weight: 400;
+    background: transparent;
+    color: @text-color;
+    text-shadow: none
 }
 
-.control-center .notification-row .notification-background {
-  border-radius: 7px;
-  color: #cdd6f4;
-  background-color: #313244;
-  box-shadow: inset 0 0 0 1px #45475a;
-  margin-top: 14px;
+.control-center {
+    background: @cc-bg;
+    border: 2px solid @noti-border-color;
+    border-radius: 10px;
 }
 
-.control-center .notification-row .notification-background .notification {
-  padding: 7px;
-  border-radius: 7px;
+.control-center-list {
+    background: transparent
 }
 
-.control-center .notification-row .notification-background .notification.critical {
-  box-shadow: inset 0 0 7px 0 #f38ba8;
+.control-center-list-placeholder {
+    opacity: .5
 }
 
-.control-center .notification-row .notification-background .notification .notification-content {
-  margin: 7px;
+.floating-notifications {
+    background: transparent;
 }
 
-.control-center .notification-row .notification-background .notification .notification-content .summary {
-  color: #cdd6f4;
+.blank-window {
+    background: alpha(black, 0.1)
 }
 
-.control-center .notification-row .notification-background .notification .notification-content .time {
-  color: #a6adc8;
+.widget-title {
+    color: #7aa2f7;
+    background: @noti-bg-darker;
+    padding: 0px 5px 0px 10px;
+    margin: 10px 10px 5px 10px;
+    font-size: 1rem;
+    border-radius: 5px;
 }
 
-.control-center .notification-row .notification-background .notification .notification-content .body {
-  color: #cdd6f4;
+.widget-title>button {
+    font-size: 0.75rem;
+    color: @text-color;
+    border-radius: 10px;
+		background: transparent;
+		border: 0.5px solid @noti-border-color;
 }
 
-.control-center .notification-row .notification-background .notification > *:last-child > * {
-  min-height: 3.4em;
+.widget-title>button:hover {
+    background: #f7768e;
+    color: @noti-border-color;
 }
 
-.control-center .notification-row .notification-background .notification > *:last-child > * .notification-action {
-  border-radius: 7px;
-  color: #cdd6f4;
-  background-color: #11111b;
-  box-shadow: inset 0 0 0 1px #45475a;
-  margin: 7px;
+.widget-dnd {
+    background: @noti-bg-darker;
+    padding: 3px 6px;
+    margin: 5px 10px 10px 10px;
+    border-radius: 5px;
+    font-size: 1rem;
+    color: #7aa2f7;
 }
 
-.control-center .notification-row .notification-background .notification > *:last-child > * .notification-action:hover {
-  box-shadow: inset 0 0 0 1px #45475a;
-  background-color: #313244;
-  color: #cdd6f4;
+.widget-dnd>switch {
+    border-radius: 5px;
+    /* border: 1px solid #7aa2f7; */
+    background: #7aa2f7;
 }
 
-.control-center .notification-row .notification-background .notification > *:last-child > * .notification-action:active {
-  box-shadow: inset 0 0 0 1px #45475a;
-  background-color: #74c7ec;
-  color: #cdd6f4;
+.widget-dnd>switch:checked {
+    background: #f7768e;
+    border: 1px solid #f7768e;
 }
 
-.control-center .notification-row .notification-background .close-button {
-  margin: 7px;
-  padding: 2px;
-  border-radius: 6.3px;
-  color: #1e1e2e;
-  background-color: #eba0ac;
+.widget-dnd>switch slider {
+    background: @cc-bg;
+    border-radius: 5px
 }
 
-.control-center .notification-row .notification-background .close-button:hover {
-  background-color: #f38ba8;
-  color: #1e1e2e;
+.widget-dnd>switch:checked slider {
+    background: @cc-bg;
+    border-radius: 5px
 }
 
-.control-center .notification-row .notification-background .close-button:active {
-  background-color: #f38ba8;
-  color: #1e1e2e;
+.widget-label {
+    margin: 10px 10px 5px 10px;
 }
 
-.control-center .notification-row .notification-background:hover {
-  box-shadow: inset 0 0 0 1px #45475a;
-  background-color: #7f849c;
-  color: #cdd6f4;
+.widget-label>label {
+    font-size: 1rem;
+    color: @text-color;
 }
 
-.control-center .notification-row .notification-background:active {
-  box-shadow: inset 0 0 0 1px #45475a;
-  background-color: #74c7ec;
-  color: #cdd6f4;
+.widget-mpris {
+    color: @text-color;
+    background: @noti-bg-darker;
+    padding: 5px 10px;
+    margin: 5px 10px 5px 10px;
+    border-radius: 5px;
 }
 
-progressbar,
-progress,
-trough {
-  border-radius: 12.6px;
+.widget-mpris > box > button {
+    border-radius: 5px;
 }
 
-progressbar {
-  box-shadow: inset 0 0 0 1px #45475a;
+.widget-mpris-player {
+    padding: 5px 10px;
+    margin: 10px
 }
 
-.notification.critical progress {
-  background-color: #f38ba8;
+.widget-mpris-title {
+    font-weight: 700;
+    font-size: 1.25rem
 }
 
-.notification.low progress,
-.notification.normal progress {
-  background-color: #89b4fa;
+.widget-mpris-subtitle {
+    font-size: 1.1rem
 }
 
-trough {
-  background-color: #313244;
+.widget-buttons-grid {
+    font-size: x-large;
+    padding: 4px;
+    margin: 5px 10px 10px 10px;
+    border-radius: 5px;
+    background: @noti-bg-darker;
 }
 
-.control-center trough {
-  background-color: #45475a;
+.widget-buttons-grid>flowbox>flowboxchild>button {
+    margin: 3px;
+    background: @cc-bg;
+    border-radius: 5px;
+    color: @text-color
 }
 
-.control-center-dnd {
-  margin-top: 5px;
-  border-radius: 8px;
-  background: #313244;
-  border: 1px solid #45475a;
-  box-shadow: none;
+.widget-buttons-grid>flowbox>flowboxchild>button:hover {
+    background: rgba(122, 162, 247, 0.1);
+    color: @noti-border-color;
 }
 
-.control-center-dnd:checked {
-  background: #313244;
+.widget-menubar>box>.menu-button-bar>button {
+    border: none;
+    background: transparent
 }
 
-.control-center-dnd slider {
-  background: #45475a;
-  border-radius: 8px;
+.topbar-buttons>button {
+    border: none;
+    background: transparent
 }
 
-.widget-dnd {
-  margin: 0px;
-  font-size: 1.1rem;
+.widget-volume {
+    background: @noti-bg-darker;
+    padding: 5px;
+    margin: 10px 10px 5px 10px;
+    border-radius: 5px;
+    font-size: x-large;
+    color: @text-color;
 }
 
-.widget-dnd > switch {
-  font-size: initial;
-  border-radius: 8px;
-  background: #313244;
-  border: 1px solid #45475a;
-  box-shadow: none;
+.widget-volume>box>button {
+    background: #7aa2f7;
+    border: none
 }
 
-.widget-dnd > switch:checked {
-  background: #313244;
+.per-app-volume {
+    background-color: @noti-bg;
+    padding: 4px 8px 8px;
+    margin: 0 8px 8px;
+    border-radius: 5px;
 }
 
-.widget-dnd > switch slider {
-  background: #45475a;
-  border-radius: 8px;
-  border: 1px solid #6c7086;
+.widget-backlight {
+    background: @noti-bg-darker;
+    padding: 5px;
+    margin: 10px 10px 5px 10px;
+    border-radius: 5px;
+    font-size: x-large;
+    color: @text-color
 }
diff --git a/config/waybar/configs/[TOP] Default Laptop b/config/waybar/configs/[TOP] Default Laptop
index 24f2755..89f6bbb 100644
--- a/config/waybar/configs/[TOP] Default Laptop	
+++ b/config/waybar/configs/[TOP] Default Laptop	
@@ -45,6 +45,7 @@
 "modules-right": [
 	"network#speed",
 	"custom/separator#dot-line",
+	"custom/swaync",
 	"tray",
 	"mpris", 
 	"custom/separator#dot-line",
diff --git a/config/waybar/modules b/config/waybar/modules
index 992eeb1..6dac507 100644
--- a/config/waybar/modules
+++ b/config/waybar/modules
@@ -1,4 +1,4 @@
-git@github.com:SherLock707/Hyprland-Dots.git//* ---- 💫 https://github.com/JaKooLit 💫 ---- *//
+//* ---- 💫 https://github.com/JaKooLit 💫 ---- *//
 
 {
 // HYPRLAND WORKSPACES. CHOOSE as desired and place on waybar configs
@@ -544,6 +544,27 @@ git@github.com:SherLock707/Hyprland-Dots.git//* ---- 💫 https://github.com/JaK
     "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
     "smooth-scrolling-threshold": 1,
 },
+
+"custom/swaync": {
+    "tooltip": false,
+    "format": "{icon} {}",
+    "format-icons": {
+      "notification": "<span foreground='red'><sup></sup></span>",
+      "none": "",
+      "dnd-notification": "<span foreground='red'><sup></sup></span>",
+      "dnd-none": "",
+      "inhibited-notification": "<span foreground='red'><sup></sup></span>",
+      "inhibited-none": "",
+      "dnd-inhibited-notification": "<span foreground='red'><sup></sup></span>",
+      "dnd-inhibited-none": ""
+    },
+    "return-type": "json",
+    "exec-if": "which swaync-client",
+    "exec": "swaync-client -swb",
+    "on-click": "sleep 0.1 && swaync-client -t -sw",
+    "on-click-right": "swaync-client -d -sw",
+    "escape": true,
+},
       
 "custom/power": {
     "format": "⏻ ",
@@ -714,26 +735,6 @@ git@github.com:SherLock707/Hyprland-Dots.git//* ---- 💫 https://github.com/JaK
     "interval" : 86400, // once every day
     "tooltip": true,
 },
-"custom/swaync": {
-    "tooltip": false,
-    "format": "{icon} {}",
-    "format-icons": {
-      "notification": "<span foreground='red'><sup></sup></span>",
-      "none": "",
-      "dnd-notification": "<span foreground='red'><sup></sup></span>",
-      "dnd-none": "",
-      "inhibited-notification": "<span foreground='red'><sup></sup></span>",
-      "inhibited-none": "",
-      "dnd-inhibited-notification": "<span foreground='red'><sup></sup></span>",
-      "dnd-inhibited-none": ""
-    },
-    "return-type": "json",
-    "exec-if": "which swaync-client",
-    "exec": "swaync-client -swb",
-    "on-click": "sleep 0.1 && swaync-client -t -sw",
-    "on-click-right": "swaync-client -d -sw",
-    "escape": true,
-  },
   
 }
   
diff --git a/config/waybar/style/Catppuccin-Latte.css b/config/waybar/style/Catppuccin-Latte.css
index eff29a7..18b1663 100644
--- a/config/waybar/style/Catppuccin-Latte.css
+++ b/config/waybar/style/Catppuccin-Latte.css
@@ -75,6 +75,7 @@ window#waybar.hidden {
 #custom-lock,
 #custom-menu,
 #custom-power,
+#custom-speaker,
 #custom-power_vertical,
 #custom-updater,
 #custom-weather,
@@ -123,6 +124,10 @@ window#waybar.hidden {
   box-shadow: inset 0 -3px transparent;
 }
 
+#bluetooth {
+	color: @blue;
+}
+
 #clock {
   color: @yellow;
 }
diff --git a/config/waybar/style/Catppuccin-Mocha.css b/config/waybar/style/Catppuccin-Mocha.css
index 63075ef..061106c 100644
--- a/config/waybar/style/Catppuccin-Mocha.css
+++ b/config/waybar/style/Catppuccin-Mocha.css
@@ -82,7 +82,7 @@ window#waybar.hidden {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
@@ -105,6 +105,7 @@ window#waybar.hidden {
   color: @blue;
 }
 
+#bluetooth,
 #backlight {
   color: @blue;
 }
diff --git a/config/waybar/style/Crimson.css b/config/waybar/style/Crimson.css
index acf8048..fcac5dc 100644
--- a/config/waybar/style/Crimson.css
+++ b/config/waybar/style/Crimson.css
@@ -137,7 +137,7 @@ tooltip {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/Rose Pine.css b/config/waybar/style/Rose Pine.css
index a585a20..4a15422 100644
--- a/config/waybar/style/Rose Pine.css	
+++ b/config/waybar/style/Rose Pine.css	
@@ -126,7 +126,7 @@ tooltip {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-swaync,
 #custom-weather,
diff --git a/config/waybar/style/Simple Pink.css b/config/waybar/style/Simple Pink.css
index f449e7a..d306dd8 100644
--- a/config/waybar/style/Simple Pink.css	
+++ b/config/waybar/style/Simple Pink.css	
@@ -152,7 +152,7 @@ tooltip {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/[Black & White] Monochrome.css b/config/waybar/style/[Black & White] Monochrome.css
index 6574848..143e887 100644
--- a/config/waybar/style/[Black & White] Monochrome.css	
+++ b/config/waybar/style/[Black & White] Monochrome.css	
@@ -136,7 +136,7 @@ tooltip label{
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css b/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css
index ad1981e..1a29c40 100644
--- a/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css	
+++ b/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css	
@@ -76,6 +76,7 @@ window#waybar.empty #window {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
@@ -125,6 +126,7 @@ window#waybar.empty #window {
     color: @rosewater;
 }
 
+#custom-swaync,
 #custom-keybinds,
 #tray {
 	color: aliceblue;
diff --git a/config/waybar/style/[Colored] Chroma Glow.css b/config/waybar/style/[Colored] Chroma Glow.css
index e28973a..f324bf3 100644
--- a/config/waybar/style/[Colored] Chroma Glow.css	
+++ b/config/waybar/style/[Colored] Chroma Glow.css	
@@ -124,7 +124,7 @@ tooltip label{
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
@@ -223,6 +223,7 @@ label:focus {
     color: #df3320;
 }
 
+#custom-swaync,
 #custom-keybinds {
 	color: #1e66f5;	
 }
diff --git a/config/waybar/style/[Colored] Translucent.css b/config/waybar/style/[Colored] Translucent.css
index 9a096c3..0e3cbaf 100644
--- a/config/waybar/style/[Colored] Translucent.css	
+++ b/config/waybar/style/[Colored] Translucent.css	
@@ -138,7 +138,7 @@ tooltip label{
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/[Colorful] Aurora Blossom.css b/config/waybar/style/[Colorful] Aurora Blossom.css
index 369300a..8a0f852 100644
--- a/config/waybar/style/[Colorful] Aurora Blossom.css	
+++ b/config/waybar/style/[Colorful] Aurora Blossom.css	
@@ -125,7 +125,7 @@ tooltip label{
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/[Colorful] Aurora.css b/config/waybar/style/[Colorful] Aurora.css
index 297be9d..a5e57cb 100644
--- a/config/waybar/style/[Colorful] Aurora.css	
+++ b/config/waybar/style/[Colorful] Aurora.css	
@@ -115,7 +115,7 @@ tooltip label{
 #custom-menu,
 #custom-power,
 #custom-power_vertical,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/[Colorful] Rainbow Spectrum.css b/config/waybar/style/[Colorful] Rainbow Spectrum.css
index 6515e14..333f798 100644
--- a/config/waybar/style/[Colorful] Rainbow Spectrum.css	
+++ b/config/waybar/style/[Colorful] Rainbow Spectrum.css	
@@ -80,7 +80,7 @@ tooltip label{
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
@@ -239,6 +239,7 @@ tooltip label{
 	background-color: #94e2d5;
 }
 
+#custom-swaync,
 #custom-weather {
 	background-color: #cba6f7;
 }
diff --git a/config/waybar/style/[Dark] Golden Noir.css b/config/waybar/style/[Dark] Golden Noir.css
index 25be8e8..667b06e 100644
--- a/config/waybar/style/[Dark] Golden Noir.css	
+++ b/config/waybar/style/[Dark] Golden Noir.css	
@@ -150,7 +150,7 @@ tooltip {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/[Dark] Obsidian Edge.css b/config/waybar/style/[Dark] Obsidian Edge.css
index 587c3f0..8d21d72 100644
--- a/config/waybar/style/[Dark] Obsidian Edge.css	
+++ b/config/waybar/style/[Dark] Obsidian Edge.css	
@@ -143,7 +143,7 @@ tooltip label {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/[Dark] Purpl.css b/config/waybar/style/[Dark] Purpl.css
index e3a3573..0f97470 100644
--- a/config/waybar/style/[Dark] Purpl.css	
+++ b/config/waybar/style/[Dark] Purpl.css	
@@ -147,7 +147,7 @@ tooltip {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/[Light] Monochrome Contrast.css b/config/waybar/style/[Light] Monochrome Contrast.css
index d70ce5e..34b579f 100644
--- a/config/waybar/style/[Light] Monochrome Contrast.css	
+++ b/config/waybar/style/[Light] Monochrome Contrast.css	
@@ -137,7 +137,7 @@ tooltip label{
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/[Light] Obsidian Glow.css b/config/waybar/style/[Light] Obsidian Glow.css
index 9b4b07a..cd939b5 100644
--- a/config/waybar/style/[Light] Obsidian Glow.css	
+++ b/config/waybar/style/[Light] Obsidian Glow.css	
@@ -112,7 +112,7 @@ tooltip label {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/[Pywal] Chroma Edge.css b/config/waybar/style/[Pywal] Chroma Edge.css
index 0bc333a..282057c 100644
--- a/config/waybar/style/[Pywal] Chroma Edge.css	
+++ b/config/waybar/style/[Pywal] Chroma Edge.css	
@@ -117,7 +117,7 @@ tooltip label{
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
@@ -207,7 +207,8 @@ tooltip label{
 	color: #d6e7e5;
 }
 
-#custom-weather.default {
+#custom-swaync,
+#custom-weather {
 	color: #ebecf0;
 }
 
diff --git a/config/waybar/style/[Pywal] Chroma Fusion.css b/config/waybar/style/[Pywal] Chroma Fusion.css
index 05d881f..3f15037 100644
--- a/config/waybar/style/[Pywal] Chroma Fusion.css	
+++ b/config/waybar/style/[Pywal] Chroma Fusion.css	
@@ -76,6 +76,7 @@ window#waybar.empty #window {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
@@ -109,6 +110,7 @@ window#waybar.empty #window {
     opacity:1.0;
 }
 
+#custom-swaync,
 #custom-weather,
 #custom-updater {
     color: @yellow;
diff --git a/config/waybar/style/[Pywal] Chroma Tally.css b/config/waybar/style/[Pywal] Chroma Tally.css
index 5ea40d8..c3a38fb 100644
--- a/config/waybar/style/[Pywal] Chroma Tally.css	
+++ b/config/waybar/style/[Pywal] Chroma Tally.css	
@@ -82,7 +82,7 @@ window#waybar {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
@@ -189,6 +189,7 @@ window#waybar {
 #tray {
 }
 
+#custom-swaync,
 #custom-menu {
 	color: yellow;
 }
diff --git a/config/waybar/style/[Pywal] Colored.css b/config/waybar/style/[Pywal] Colored.css
index b1e2b00..afb0128 100644
--- a/config/waybar/style/[Pywal] Colored.css	
+++ b/config/waybar/style/[Pywal] Colored.css	
@@ -144,7 +144,7 @@ tooltip {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/[Pywal] Simple.css b/config/waybar/style/[Pywal] Simple.css
index 9d8c1c8..6acef45 100644
--- a/config/waybar/style/[Pywal] Simple.css	
+++ b/config/waybar/style/[Pywal] Simple.css	
@@ -132,7 +132,7 @@ tooltip {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/[Retro] Simple Style.css b/config/waybar/style/[Retro] Simple Style.css
index da5c5a2..aaf14d6 100644
--- a/config/waybar/style/[Retro] Simple Style.css	
+++ b/config/waybar/style/[Retro] Simple Style.css	
@@ -75,7 +75,7 @@ window#waybar {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
@@ -89,7 +89,7 @@ window#waybar {
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
   color: @foreground;
-  padding: 5px 8px 5px 8px;
+  padding: 3px 6px 3px 6px;
 }
 
 #battery.warning,
diff --git a/config/waybar/style/[Transparent] Crystal Clear.css b/config/waybar/style/[Transparent] Crystal Clear.css
index 27cd99a..3f64235 100644
--- a/config/waybar/style/[Transparent] Crystal Clear.css	
+++ b/config/waybar/style/[Transparent] Crystal Clear.css	
@@ -122,6 +122,7 @@ tooltip {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
+#custom-swaync,
 #custom-spotify,
 #custom-updater,
 #custom-weather,