diff --git a/.config/spotifyd/logo.png b/.config/spotifyd/logo.png
new file mode 100644
index 0000000..c6949aa
Binary files /dev/null and b/.config/spotifyd/logo.png differ
diff --git a/.config/waybar/config b/.config/waybar/config
index 43c4b19..c3a9bb8 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -1,18 +1,12 @@
 {
+  "include": "~/.config/waybar/local.d/*",
   "position": "top",
   "spacing": 0,
-  "modules-left": ["network", "clock"],
-  "modules-center": ["sway/workspaces", "custom/spotifyd"],
-  "modules-right": ["pulseaudio", "memory", "cpu", "temperature#cpu", "backlight", "battery"],
-
   "clock": {
     "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
     "format": " {:%A, %d %B %Y, %H:%M}",
     "interval": 60
   },
-  "backlight": {
-    "format": " {}%"
-  },
   "cpu": {
     "format": " {usage}%"
   },
@@ -24,28 +18,6 @@
     "critical-threshold": 70,
     "format": " {temperatureC}°C "
   },
-  "custom/spotifyd": {
-    "format": " {}",
-    "return-type": "json",
-    "exec": "spdcon -o waybar",
-    "on-click": "spdcon -c PlayPause",
-    "on-click-right": "spdcon -c Next",
-    "on-click-middle": "spdcon -c Previous",
-    "interval": 2,
-  },
-  "battery": {
-    "states": {
-      "warning": 30,
-      "critical": 15
-    },
-    "format": "{icon} {capacity}%",
-    "format-charging": " {capacity}%",
-    "format-plugged": " {capacity}%",
-    "format-alt": "{time} {icon}",
-    // "format-good": "", // An empty format will hide the module
-    // "format-full": "",
-    "format-icons": ["", "", "", "", ""]
-  },
   "network": {
     "format-wifi": " {ipaddr}",
     "format-ethernet": " {ipaddr}/{cidr}",
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index cafb589..fe39eae 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -23,7 +23,7 @@ window#waybar {
 
 /* Modules */
 
-#clock, #battery, #cpu, #memory, #disk, #temperature, #backlight, #network, #pulseaudio, #custom-media, #custom-launcher, #custom-power, #tray, #mode, #idle_inhibitor , #mpd, .spdcon {
+#clock, #battery, #cpu, #memory, #disk, #temperature, #backlight, #network, #pulseaudio, #custom-media, #custom-launcher, #custom-power, #tray, #mode, #idle_inhibitor , #mpd, #custom-waybar-mpris {
   padding: 0 10px;
   margin: 0px 5px;
   background: #fbf1c7;
@@ -57,3 +57,8 @@ window#waybar {
 #pulseaudio.muted {
     background-color: #cc241d;
 }
+
+tooltip {
+  background: #fbf1c7;
+  border: 1px solid rgba(100, 114, 125, 0.5);
+}
diff --git a/scripts/songnotification b/scripts/songnotification
index b47e979..7c12027 100755
--- a/scripts/songnotification
+++ b/scripts/songnotification
@@ -1,4 +1,6 @@
 #!/bin/sh
-#song=$(playerctl metadata --format "{{ title }}\n{{ artist }}\n{{ album }}")
-#notify-send "Now Playing" "$song" #--icon=~/.config/spotifyd/penguin.jpg
+song=$(playerctl metadata --format "{{ title }}\n{{ artist }}")
 
+if [[ $PLAYER_EVENT = "load" ]]; then
+  notify-send "Now Playing" "$song" --icon=~/.config/spotifyd/logo.png
+fi