diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 3d93f11..e075e21 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -56,7 +56,7 @@ exec-once = /usr/lib/polkit-kde-authentication-agent-1
 exec-once = sleep 1; blueman-applet
 exec-once = hyprpaper
 exec-once = swaync
-exec-once = [workspace special:music silent] sleep 1; supersonic-desktop
+exec-once = [workspace special:music silent] sleep 1; feishin --enable-features=UseOzonePlatform --ozone-platform=wayland
 exec-once = waybar
 exec-once = hypridle
 exec-once = hyprctl setcursor Dracula-cursors 24
@@ -66,9 +66,9 @@ exec-once = gimp
 exec-once = virt-manager
 exec-once = [workspace 2 silent] kitty --session ~/.config/kitty/session --listen-on=unix:@mykitty
 exec-once = [workspace 2 silent] sleep 1; kitty newsboat
-exec-once = [workspace 6 silent] kitty btop
-exec-once = [workspace 6 silent] sleep 1; kitty 
-exec-once = [workspace 6 silent] sleep 2;kitty zsh -c "source ~/.zshrc;nnn -deUxH"
+exec-once = [workspace 7 silent] kitty btop
+exec-once = [workspace 7 silent] sleep 1; kitty 
+exec-once = [workspace 7 silent] sleep 2;kitty zsh -c "source ~/.zshrc;nnn -deUxH"
 exec-once = steam -silent
 exec-once = sleep 1; heroic --ozone-platform=wayland 
 exec-once = [workspace special:password silent] keepassxc 
@@ -148,7 +148,6 @@ windowrule = workspace 3 silent,class:libreoffice-writer
 windowrule = workspace 4 silent,class:gimp
 windowrule = workspace 5 silent,class:virt-manager
 windowrule = workspace special:email silent,class:tutanota-desktop
-windowrule = workspace special:music silent,class:supersonic-desktop
 windowrule = size 300 500,title:Friends List
 windowrule = center,title:Steam
 windowrule = float,class:steam
@@ -175,6 +174,9 @@ windowrule = size 1000 600,title:Open Files
 windowrule = float,title:Signal
 windowrule = center,title:Signal
 windowrule = size 1280 720,title:Signal
+windowrule = float,class:feishin
+windowrule = center,class:feishin
+windowrule = size 1600 900, class:feishin
 windowrule = float,class:org.keepassxc.KeePassXC
 windowrule = size 800 600,class:org.keepassxc.KeePassXC
 windowrule = center,class:org.keepassxc.KeePassXC
@@ -201,6 +203,9 @@ windowrule = center,class:imv
 windowrule = float,class:org.pwmt.zathura
 windowrule = center,class:org.pwmt.zathura
 windowrule = idleinhibit fullscreen, fullscreen:1
+windowrule = float,class:tutanota-desktop 
+windowrule = center,class:tutanota-desktop
+windowrule = size 1705 909,class:tutanota-desktop
 windowrule = float,class:xdg-desktop-portal-gtk
 windowrule = float,class:blueman-manager
 windowrule = center,class:blueman-manager
@@ -225,7 +230,7 @@ bind = $mainMod CTRL, Y, exec, heroic
 bind = $mainMod, N, exec, exec swaync-client -t -sw
 bind = $mainMod CTRL, U, exec, [workspace special:scratchpad silent] signal-desktop --ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations
 bind = $mainMod CTRL, P, exec, [workspace special:password silent] keepassxc
-bind = $mainMod CTRL, M, exec, [workspace special:music silent] sleep 1; supersonic-desktop
+bind = $mainMod CTRL, M, exec, [workspace special:music silent] sleep 1; feishin --enable-features=UseOzonePlatform --ozone-platform=wayland 
 
 # Resize windows main keybind
 bind=ALT,R,submap,resize
@@ -331,8 +336,8 @@ workspace = 2, monitor:DP-1
 workspace = 3, monitor:DP-1
 workspace = 4, monitor:DP-1
 workspace = 5, monitor:DP-1
-workspace = 6, monitor:DP-2, default:true
-workspace = 7, monitor:DP-2
+workspace = 6, monitor:DP-1
+workspace = 7, monitor:DP-2, default:true
 workspace = 8, monitor:DP-2
 workspace = 9, monitor:DP-2
 workspace = 10, monitor:DP-2
diff --git a/.config/supersonic/themes/dracula.toml b/.config/supersonic/themes/dracula.toml
deleted file mode 100644
index 380f66a..0000000
--- a/.config/supersonic/themes/dracula.toml
+++ /dev/null
@@ -1,25 +0,0 @@
-[SupersonicTheme]
-Name = "Dracula"
-Version = "0.2"
-SupportsDark = true
-SupportsLight = false
-
-[DarkColors]
-PageBackground = "#282A36"
-InputBackground = "#44475A"
-InputBorder = "#44475A"
-MenuBackground = "#282A36"
-OverlayBackground = "#282A36"
-Hyperlink = "#BD93F9"
-Pressed = "#44475A"
-ListHeader = "#1E1F29"
-PageHeader = "#1E1F29"
-Background = "#1E1F29"
-ScrollBar = "#44475A"
-Button = "#282A36"
-DisabledButton = "#1E1F29"
-Selection = "#44475A"
-#Primary = "#BD93F9"
-Focus = "#BD93F9"
-Separator = "#44475A"
-Foreground = "#F8F8F2"
diff --git a/.config/swaync/config.json b/.config/swaync/config.json
index 80fb817..9d3d69e 100755
--- a/.config/swaync/config.json
+++ b/.config/swaync/config.json
@@ -49,8 +49,6 @@
 		"mpris": {
 			"image-size": 96,
 			"image-radius": 12
-                        "blacklist": [ "playerctld", "feishin" ],
-                        "autohide": true
 		}
 	}
 }
diff --git a/.config/waybar/config b/.config/waybar/config
index 3104e96..3ad4919 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -1,56 +1,13 @@
 [{ 
     "output": "DP-1", 
     "layer": "top",
-    "modules-left": ["hyprland/window"],
-    "modules-center": ["hyprland/mode"],
-    "hyprland/window": {
-       "format": "<span color=\"#f8f8f2\">{title}</span>  ",
-       "max-length": 60,
-       "icon": true,
-       "icon-size": 20,
-       "all-outputs" : true,  
-    },
-   }, {
-    "output": "DP-2",
-    "layer": "top",  
     "modules-left": ["hyprland/workspaces", "hyprland/mode"],
-    "modules-center": ["custom/gpu-usage", "cpu", "memory", "group/disks", "temperature", "clock", "custom/weather", "idle_inhibitor", "custom/pacman", "group/networks", "bluetooth", "group/audio-player"],
-    /* "modules-right": ["tray", "custom/scratchpad-indicator", "pulseaudio",], */
-    "modules-right": ["group/taskbar", "group/group-power"],
-
-    "hyprland/mode": {
-        "format": "  󰹶  {}"
-    },
-    "hyprland/workspaces": {
-        "format": "{icon}",
-        "all-outputs": true,
-        "on-click": "activate",
-        "format-icons": {
-            "1": "󰈹",
-            "2": "󰒋",
-            "3": "󰷈",
-            "4": "󱇤",
-            "5": "",
-            "6": "",
-            "7": "󰙵",
-            "8": "󰙵",
-            "9": "󰙵",
-            "10": "󰙵",
-            "11": "󰙵",
-            "12": "󰙵",
-         },
-         "sort-by-number": true
-    },
-    "group/audio-player": {
-            "orientation": "inherit",
-            "modules": [
-                    "mpris",
-                    "cava"
-             ]
-         }, 
+    "modules-center": ["hyprland/window"],
+    "modules-right": ["mpris"],
+  
 "mpris": {
-	"format": "<span color=\"#bd93f9\">{player_icon}</span> <span color=\"#f8f8f2\">Playing  </span>",
-	"format-paused": "<span color=\"#bd93f9\">{status_icon}</span> <span color=\"#f8f8f2\">Paused  </span>",
+	"format": "<span color=\"#bd93f9\">{player_icon}</span> <span color=\"#f8f8f2\">{dynamic}</span>",
+	"format-paused": "<span color=\"#bd93f9\">{status_icon}</span> <span color=\"#f8f8f2\">{dynamic}</span>",
         "tooltip-format": "󰠃 {artist}:  {title} (󰀥 {album})",
         "interval": 1,
         "album-len": 0,
@@ -61,29 +18,51 @@
 	"status-icons": {
 		"paused": "",
 	},
-//	"ignored-players": ["firefox"] 
+	"ignored-players": ["firefox"] 
     },
+    "hyprland/window": {
+       "format": "<span color=\"#f8f8f2\">{title}</span>  ",
+       "max-length": 60,
+       "icon": true,
+       "icon-size": 20,
+       "all-outputs" : true,  
+    },
+    "hyprland/workspaces": {
+        "format": "{icon}",
+        "on-click": "activate",
+        "format-icons": {
+            "1": "󰈹",
+            "2": "󰒋",
+            "3": "󰷈",
+            "4": "󱇤",
+            "5": "",
+            "6": "󰙵",
+    },
+    "sort-by-number": true
+   },
+   }, {
+    "output": "DP-2",
+    "layer": "top",  
+    "modules-left": ["hyprland/workspaces", "hyprland/mode"],
+    "modules-center": ["custom/gpu-usage", "cpu", "memory", "temperature", "network", "custom/vpn", "bluetooth", "clock", "custom/weather", "idle_inhibitor", "custom/pacman", "disk", "disk#disk2", "disk#disk3", "disk#disk4", "disk#disk5"],
+    /* "modules-right": ["tray", "custom/scratchpad-indicator", "pulseaudio",], */
+    "modules-right": ["tray", "pulseaudio", "group/group-power"],
 
-"cava": {
-        "cava_config": "/home/peter/.config/cava/config",
-        "framerate": 240,
-        "autosens": 1,
-        "bars": 6,
-        "lower_cutoff_freq": 50,
-        "higher_cutoff_freq": 10000,
-        "method": "pipewire",
-        "source": "auto",
-        "stereo": true,
-        "reverse": false,
-        "bar_delimiter": 32,
-        "monstercat": false,
-        "waves": false,
-        "noise_reduction": 0.77,
-        "input_delay": 2,
-        "format-icons" : ["<small>▁</small>", "<small>▂</small>", "<small>▃</small>", "<small>▄</small>", "<small>▅</small>", "<small>▆</small>", "<small>▇</small>", "<small>█</small>" ],
-        "actions": {
-                   "on-click-right": "mode"
-                   }
+    "hyprland/mode": {
+        "format": "  󰹶  {}"
+    },
+    "hyprland/workspaces": {
+        "format": "{icon}",
+        "on-click": "activate",
+        "format-icons": {
+            "7": "",
+            "8": "󰈹",
+            "9": "󰙵",
+            "10": "󰙵",
+            "11": "󰙵",
+            "12": "󰙵",
+         },
+         "sort-by-number": true
     },
     "custom/pacman": {
         "format": "<span color=\"#8BE9FD\"> </span>{}",
@@ -122,13 +101,6 @@
         "tooltip": false,
         "on-click": "shutdown -h now"
     },
-    "group/networks": {
-            "orientation": "inherit",
-            "modules": [
-                    "network",
-                    "custom/vpn",
-             ]
-         },
     "network": {
         "interface": "enp7s0",
         "format": "{ifname}",
@@ -150,13 +122,6 @@
         },
 		"on-click": "toggleRemote"
     },
-    "group/taskbar": {
-            "orientation": "inherit",
-            "modules": [
-                    "tray",
-                    "pulseaudio"
-             ]
-         },
     "tray": {
         "icon-size": 20,
         "spacing": 6
@@ -185,21 +150,6 @@
     "format": "<span color=\"#f1fa8c\"></span> {temperatureC}°C",
     "tooltip": false,
     },
-    "group/disks": {
-            "orientation": "inherit",
-    "drawer": {
-        "transition-duration": 500,
-        "transition-left-to-right": true,
-        "click-to-reveal": true,
-    },
-            "modules": [
-                    "disk",
-                    "disk#disk2",
-                    "disk#disk3",
-                    "disk#disk4",
-                    "disk#disk5"
-             ]
-         },
     "disk": {
     "interval": 30,
     "format": "<span color=\"#8694c0\"></span><span color=\"#ffb86c\">󰋊 </span>/: {percentage_used}%",
@@ -256,7 +206,7 @@
 	"tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%"
       },
 "custom/vpn": {
-    "format": "<span color=\"#ff5555\"> </span>",
+    "format": "<span color=\"#ff5555\"></span> VPN",
     "tooltip": true,
     "tooltip-format": "Connected",
     "exec": "echo '{\"class\": \"connected\"}'",
@@ -274,7 +224,7 @@
         // "format-alt": "{alt}",
 }, 
     "custom/gpu-usage": {
-        "exec": "cat /sys/class/hwmon/hwmon1/device/gpu_busy_percent",
+        "exec": "cat /sys/class/hwmon/hwmon2/device/gpu_busy_percent",
         "format": "<span color=\"#8694c0\"></span><span color=\"#bd93f9\">󰍹 </span>{}%",
         "return-type": "",
         "interval": 1,
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 702d439..c0bccfb 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -49,7 +49,7 @@ window#waybar.hidden {
 }
 
 
-#networks {
+#network {
 	margin-top: 6px;
 	margin-left: 8px;
 	padding-left: 10px;
@@ -64,8 +64,15 @@ window#waybar.hidden {
 }
 
 #pulseaudio {
-	margin-left: 2px;
-	color: #f8f8f2;
+	margin-top: 6px;
+	margin-left: 8px;
+	padding-left: 10px;
+	padding-right: 10px;
+	margin-bottom: 0px;
+	border-radius: 10px;
+	transition: none;
+	color: #282a36;
+	background: #50fa7b;
 }
 
 #bluetooth {
@@ -161,9 +168,9 @@ window#waybar.hidden {
 	background: #282a36;
 }
 
-#taskbar {
+#tray {
 	margin-top: 6px;
-	margin-left: 8px;
+	margin-left: 28px;
 	padding-left: 10px;
 	margin-bottom: 0px;
 	padding-right: 10px;
@@ -211,7 +218,15 @@ window#waybar.hidden {
 }
 
 #custom-vpn {
+	margin-top: 6px;
+	margin-left: 8px;
+	padding-left: 10px;
+	padding-right: 10px;
+	margin-bottom: 0px;
+	border-radius: 10px;
+	transition: none;
 	color: #f8f8f2;
+	background: #282a36;
 }
 
 #custom-weather {
@@ -254,19 +269,6 @@ window#waybar.hidden {
     color: #f8f8f2;
 }
 
-#user {
-	margin-top: 6px;
-	margin-left: 8px;
-	padding-left: 10px;
-	padding-right: 10px;
-	margin-bottom: 0px;
-	border-radius: 10px;
-	transition: none;
-	color: #f8f8f2;
-	background: transparent;
-
-}
-
 #custom-gpu-usage {
 	margin-top: 6px;
 	margin-left: 8px;
@@ -278,7 +280,19 @@ window#waybar.hidden {
 	color: #f8f8f2;
 	background: #282a36;
 }
-#audio-player {
+#mpris {
+	margin-top: 6px;
+	margin-left: 8px;
+	padding-left: 10px;
+	padding-right: 6px;
+	margin-right: 6px;
+	margin-bottom: 0px;
+	border-radius: 10px;
+	transition: none;
+	color: #bd93f9;
+	background: #282a36;
+}
+#custom-scratchpad-indicator {
 	margin-top: 6px;
 	margin-left: 8px;
 	padding-left: 10px;
@@ -286,8 +300,8 @@ window#waybar.hidden {
 	margin-bottom: 0px;
 	border-radius: 10px;
 	transition: none;
-	color: #50fa7b;
-	background: #282a36;
+	color: #f8f8f2;
+	background: #6272a4;
 }
 #custom-power {
 	margin-top: 6px;
@@ -326,9 +340,9 @@ window#waybar.hidden {
 #custom-pacman {
 	margin-top: 6px;
 	margin-left: 2px;
-	padding-left: 5px;
+	padding-left: 2px;
 	padding-right: 5px;
-	margin-right: 2px;
+	margin-right: 5px;
 	margin-bottom: 0px;
 	border-radius: 10px;
 	transition: none;
diff --git a/README.md b/README.md
index b916d52..76e97f8 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ I use the [Dracula theme](https://draculatheme.com/), following their [color pal
 * Fonts: [ttf-droid](https://www.droidfonts.com), [awesome-terminal-fonts](https://github.com/gabrielelana/awesome-terminal-fonts), [noto-fonts](https://fonts.google.com/noto), [gnu-free-fonts](https://www.gnu.org/software/freefont)
 * Terminal: [Kitty](https://github.com/kovidgoyal/kitty)
 * Web browser: [Firefox](https://www.mozilla.org/firefox)
-* Music player: [Supersonic](https://github.com/dweymouth/supersonic)
+* Music player: [Feishin](https://github.com/jeffvli/feishin)
 * Video player: [mpv](https://github.com/mpv-player/mpv)
 * System information tool: [Fastfetch](https://github.com/fastfetch-cli/fastfetch)
 * System monitor: [Btop](https://github.com/aristocratos/btop)