diff --git a/files/config/cmus/notify.sh b/files/config/cmus/notify.sh
deleted file mode 100755
index fc09f36..0000000
--- a/files/config/cmus/notify.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-#
-#CMUS notification
-#
-body=""
-
-while [ "$#" -ge 2 ]
-do
- printf -v "$1" "%s" "$2"
- shift
- shift
-done
-
-filename=${file#*/}
-image=${file%/*}/cover.jpg
-[ -f "$image" ] && options="$options -i \"${image}\""
-
-title=${title:-$filename}
-
-if [ -n "$artist" ]
-then
-    body="$body <i>$artist</i>\n"
-fi
-
-if [ -n "$album" ]
-then
-    body="$body $album"
-fi
-
-if [ -n "$date" ]
-then
-    body="$body ${date%%-*}"
-fi
-body=${body:-'no informations'}
-notify-send --app-name=cmus -i "$image"  "$title" "$body"
diff --git a/files/config/cmus/rc b/files/config/cmus/rc
deleted file mode 100644
index ea71c79..0000000
--- a/files/config/cmus/rc
+++ /dev/null
@@ -1,56 +0,0 @@
-## Base16 Default Dark
-
-# overall background and foreground color
-set color_win_fg=7
-set color_win_bg=0
-
-# bottom status line
-set color_statusline_fg=20
-set color_statusline_bg=19
-
-# bottom title line
-set color_titleline_fg=7
-set color_titleline_bg=18
-
-# top title area
-set color_win_title_fg=20
-set color_win_title_bg=19
-set color_win_title_attr=bold
-
-# command-line colors
-set color_cmdline_bg=default
-set color_cmdline_fg=default
-set color_error=1
-set color_info=6
-
-# separator of windows
-# should be black
-set color_separator=16
-
-# unselected currently playing track's text
-set color_win_cur=13
-
-# active selection for currently playing track
-set color_win_cur_sel_bg=20
-set color_win_cur_sel_fg=0
-set color_win_cur_sel_attr=none
-
-# inactive selection for currently playing track
-set color_win_inactive_cur_sel_bg=8
-set color_win_inactive_cur_sel_fg=21
-
-# active selection
-set color_win_sel_bg=6
-set color_win_sel_fg=0
-set color_win_sel_attr=none
-
-# inactive selection
-set color_win_inactive_sel_bg=19
-set color_win_inactive_sel_fg=20
-
-# directory listing color
-set color_win_dir=default
-
-set status_display_program=~/.config/cmus/notify.sh
-
-add -l ~/medias/music
diff --git a/group_vars/all/mako.yml b/group_vars/all/mako.yml
index c646950..15da653 100644
--- a/group_vars/all/mako.yml
+++ b/group_vars/all/mako.yml
@@ -45,9 +45,15 @@ mako_rules:
     - field: app-name
       value: cmus
     options:
-      border-color: '#00000000'
       default-timeout: 10000
       padding: 7
+      format: '%b'
+  - criterias:
+    - field: app-name
+      value: cmus
+    - field: grouped
+    options:
+      format: '%b'
 
 mako_keybindings:
   - mode: 'normal'
diff --git a/vars/ALCS-LT-YB/inputs.yml b/vars/ALCS-LT-YB/inputs.yml
deleted file mode 100644
index ebbda20..0000000
--- a/vars/ALCS-LT-YB/inputs.yml
+++ /dev/null
@@ -1,8 +0,0 @@
---- 
-local_sway_inputs:
-  - name: '65261:8800:KBDFans_DZ60'         
-    options:
-    - option: 'xkb_layout'
-      value: 'us'
-    - option: 'xkb_variant'
-      value: 'altgr-intl'
diff --git a/vars/ALCS-LT-YB/kanshi.yml b/vars/ALCS-LT-YB/kanshi.yml
deleted file mode 100644
index 6ae4599..0000000
--- a/vars/ALCS-LT-YB/kanshi.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-local_kanshi_profiles:
-  - profile: 'alienor'
-    screens:
-    - id: 'eDP-1'
-      status: 'disable'
-    - id: 'iiyama_24_g'
-      position: '0,0'
-    - id: 'iiyama_24_d'
-      position: '1920,0'
diff --git a/vars/ALCS-LT-YB/outputs.yml b/vars/ALCS-LT-YB/outputs.yml
deleted file mode 100644
index b3a0bfe..0000000
--- a/vars/ALCS-LT-YB/outputs.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-local_sway_outputs:
-  - id: 'eDP-1'
-    name: 'eDP-1'
-  - id: 'iiyama_24_g'
-    name: 'Iiyama North America PL2480H 11183M2807013'
-    status: absent
-  - id: 'iiyama_24_d'
-    name: 'Iiyama North America PL2480H 11183M2807016'
-    status: absent
diff --git a/vars/lucy/input.yml b/vars/lucy/input.yml
deleted file mode 100644
index b8fbdc6..0000000
--- a/vars/lucy/input.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-local_sway_inputs:
-  - name: '1:1:AT_Translated_Set_2_keyboard'
-    options:
-    - option: 'xkb_layout'
-      value: 'us'
-    - option: 'xkb_variant'
-      value: 'altgr-intl'
-  - name: '2:7:SynPS/2_Synaptics_TouchPad'
-    options:
-      - option: 'tap'
-        value: 'enabled'
-      - option: 'dwt'
-        value: 'enabled'
-      - option: 'pointer_accel'
-        value: 0.3
diff --git a/vars/lucy/outputs.yml b/vars/lucy/outputs.yml
deleted file mode 100644
index f74d797..0000000
--- a/vars/lucy/outputs.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-local_sway_outputs:
-  - id: 'eDP-1'
-    name: 'eDP-1'
diff --git a/vars/lucy/swaylock.yml b/vars/lucy/swaylock.yml
deleted file mode 100644
index 2dc0c5d..0000000
--- a/vars/lucy/swaylock.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-swaylock_image: ~/medias/images/wallpapers/lucy.jpg
diff --git a/vars/morty/morty.yml b/vars/morty/morty.yml
deleted file mode 100644
index 74b4394..0000000
--- a/vars/morty/morty.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-local_sway_inputs:
-  - name: '1:1:AT_Translated_Set_2_keyboard'
-    options:
-      - option: 'xkb_layout'
-        value: 'gpdwinmax'
-  - name: '2362:597:HTIX5288:00_093A:0255_Touchpad'
-    options:
-      - option: 'tap'
-        value: 'enabled'
-      - option: 'pointer_accel'
-        value: 0.3
-  - name: '1046:928:Goodix_Capacitive_TouchScreen'
-    options: 
-      - option: 'map_to_output'
-        value: 'eDP-1'
-
-local_sway_outputs:
-  - id: 'eDP-1'
-    name: 'eDP-1'
-    options:
-      transform: 90
diff --git a/vars/mrmeeseeks/kanshi.yml b/vars/mrmeeseeks/kanshi.yml
deleted file mode 100644
index 3574e1d..0000000
--- a/vars/mrmeeseeks/kanshi.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-kanshi_profiles:
-  - profile: 'home'
-    screens:
-    - id: 'iiyama_27_4k_h'
-      position: '0,0'
-    - id: 'iiyama_27_4k_v'
-      position: '1920,0'
-      transform: 270
diff --git a/vars/mrmeeseeks/sway.yml b/vars/mrmeeseeks/sway.yml
deleted file mode 100644
index ef80bda..0000000
--- a/vars/mrmeeseeks/sway.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-local_sway_outputs:
-  - id: 'bg'
-    name: '*'
-    options:
-      bg: '~/medias/images/wallpapers/desktop.jpg center #000000'
diff --git a/vars/mrmeeseeks/waybar.yml b/vars/mrmeeseeks/waybar.yml
deleted file mode 100644
index 6c2ffb3..0000000
--- a/vars/mrmeeseeks/waybar.yml
+++ /dev/null
@@ -1,77 +0,0 @@
----
-waybar_options:
-  layer: "top"
-  spacing: 6
-  disable-toolptips: true
-  modules-left:
-    - sway/workspaces
-    - sway/mode
-  modules-center: []
-  modules-right:
-    - network
-    - custom/sep
-    # - temperature
-    - memory 
-    - cpu
-    - custom/sep
-    - pulseaudio
-    - custom/sep
-    - clock
-    - custom/sep
-    - tray
-  sway/mode:
-    format: '<span style="italic">{}</span>'
-  custom/sep:
-    format: "|"
-    tooltip: false
-  sway/workspace:
-    disable-scroll: true
-  idle_inhibitor:
-    format: "{icon}"
-    format-icons:
-      activated: 
-      deactivated: 
-  clock:
-    tooltip: false
-    timezone: "Europe/Paris"
-    format-alt: "{:%Y-%m-%d}"
-  temperature:
-    thermal-zone: "{{ cpu_thermal_zone | default(6) }}"
-    critical-threshold: 80
-    format: "{temperatureC}°C  "
-  cpu:
-      format: "{usage}% {icon}"
-      tooltip: false
-      states:
-        warning: 70
-        critical: 90
-      format-icons:
-        - 
-  network:
-    tooltip: false
-    format-wifi: "{essid} ({signalStrength}%)  "
-    format-ethernet: "{ifname}: {ipaddr}/{cidr} 󰈀 "
-    format-linked: "{ifname} (No IP) 󰈀 "
-    format-disconnected: "Disconnected ⚠ "
-    format-alt: "{ifname}: {ipaddr}/{cidr}"
-  pulseaudio:
-     tooltip: false
-     format: "{format_source} {volume}% {icon} "
-     format-bluetooth: "{volume}% {icon}"
-     format-muted: "{format_source} 󰝟 "
-     format-source: "{volume}%  "
-     format-source-muted: " "
-     format-icons:
-        headphones: 󰋋
-        handsfree: 󰋎
-        headset: 󰋎
-        phone: 
-        portable: 
-        car: 
-        default: 
-  memory:
-    interval: 30
-    states:
-      warning: 70
-      critical: 90
-    format: "{used:0.1f}G/{total:0.1f}G "