diff --git a/private_dot_config/sway/config b/private_dot_config/sway/config
index 8fe2bbe..d477817 100644
--- a/private_dot_config/sway/config
+++ b/private_dot_config/sway/config
@@ -16,7 +16,9 @@ set $right l
 # Your preferred terminal emulator
 set $term foot
 # Your preferred application launcher
-set $menu wmenu-run -i
+#set $menu wmenu-run -i
+set $menu rofi -show combi
+set $windowsearch rofi -show window
 
 input * xkb_numlock enabled
 default_border pixel
@@ -86,6 +88,7 @@ output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
 
     # Start your launcher
     bindsym $mod+d exec $menu
+	bindsym $mod+f exec $windowsearch
 
     # Drag floating windows by holding down $mod and left mouse button.
     # Resize them with right mouse button + $mod.
@@ -174,7 +177,7 @@ output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
     bindsym $mod+e layout toggle split
 
     # Make the current focus fullscreen
-    bindsym $mod+f fullscreen
+    bindsym $mod+Shift+f fullscreen
 
     # Toggle the current focus between tiling and floating mode
     bindsym $mod+Shift+space floating toggle
diff --git a/private_dot_config/waybar/config.jsonc b/private_dot_config/waybar/config.jsonc
index 851fdf2..548eafa 100644
--- a/private_dot_config/waybar/config.jsonc
+++ b/private_dot_config/waybar/config.jsonc
@@ -9,6 +9,7 @@
     "modules-right": [
         "sway/scratchpad",
         "sway/workspaces",
+        "tray",
         //"sway/mode",
         "custom/power"
     ],
@@ -16,7 +17,7 @@
     "modules-center": [
         //"sway/window"
         //"wlr/taskbar"
-        "mpris"
+        "group/music"
     ],
 
     "modules-left": [
@@ -25,14 +26,13 @@
         "bluetooth",
         //"network",
         "cpu",
-        "memory",
+        "memory"
         //"backly",
         //"tempeight",
         //"keyboard-state",
         //"sway/language",
         //"battery",
         //"battery#bat2",
-        "tray"
     ],
 
     // Modules configuration
@@ -53,6 +53,39 @@
     //     }
     // },
 
+    "group/music": {
+        "modules": [
+            "mpris",
+            "cava"
+        ]
+    },
+
+    "cava": {
+        "framerate": 144,
+        "autosens": 1,
+        "sensitivity": 2,
+        "bars": 32,
+        "lower_cutoff_freq": 50,
+        "higher_cutoff_freq": 10000,
+        "hide_on_silence": false,
+        "format_silent": "quiet",
+        "method": "pulse",
+        "source": "auto",
+        "stereo": true,
+        "reverse": false,
+        "bar_delimiter": 0,
+        "monstercat": true,
+        "waves": true,
+        "noise_reduction": 0.77,
+        "input_delay": 2,
+        "bar_width": 2,
+        "bar_spacing": 10,
+        "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" ],
+        "actions": {
+                   "on-click-right": "mode"
+                   },
+        "cava_config": "/home/yarne/.config/cava/config"
+    },
     "bluetooth": {
         "format":" {status}",
         "format-disabled":"",
@@ -124,7 +157,7 @@
     "clock": {
         "interval": 1,
         "timezone": "Europe/Brussels",
-        "format": "{:%H:%M:%S | %a %d/%m/%Y}",
+        "format": "{:%H:%M:%S\n%a %d/%m/%Y}",
         "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
         //"format-alt": "{:%Y-%m-%d}"
     },
@@ -209,8 +242,8 @@
         "on-click": "pavucontrol"
     },
     "mpris": {
-        "format": "{player_icon} {player} : {artist} - {title}",
-        "format-paused": "{status_icon} {player} : {artist} - {title}",
+        "format": "{player_icon} {title}",
+        "format-paused": "{status_icon} {title}",
         "player-icons": {
             "default": "▶",
             "mpv": "🎵"
diff --git a/private_dot_config/waybar/style.css b/private_dot_config/waybar/style.css
index 7e83028..6b648b5 100644
--- a/private_dot_config/waybar/style.css
+++ b/private_dot_config/waybar/style.css
@@ -1,6 +1,7 @@
 * {
     /* `otf-font-awesome` is required to be installed for icons */
-    font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+    /* font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif; */
+    font-family: JetBrainsMono Nerd Font;
     font-size: 13px;
 }
 
@@ -256,6 +257,14 @@ label:focus {
     color: #2d3436;
 }
 
+#music {
+    margin-top: 5px;
+}
+
+#cava {
+    margin-top: 5px;
+}
+
 #mpd {
     background-color: #66cc99;
     color: #2a5c45;