diff --git a/.config/ags b/.config/ags
deleted file mode 160000
index d743c98..0000000
--- a/.config/ags
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d743c98a6a74b344cea0fb4c21271523cc1a64eb
diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
new file mode 100644
index 0000000..300693b
--- /dev/null
+++ b/.config/dunst/dunstrc
@@ -0,0 +1,21 @@
+[global]
+frame_color = "#8aadf4"
+separator_color= frame
+font = JetBrains Mono Medium 12
+markup = full
+browser = firefox
+corner_radius = 8
+show_indicators = yes
+
+[urgency_low]
+background = "#24273a"
+foreground = "#cad3f5"
+
+[urgency_normal]
+background = "#24273a"
+foreground = "#cad3f5"
+
+[urgency_critical]
+background = "#24273a"
+foreground = "#cad3f5"
+frame_color = "#f5a97f"
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index ddd46d7..9b64a48 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -52,7 +52,7 @@ $menu = wofi --show drun
 exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 exec-once = flatpak run com.core447.StreamController
-exec-once = ags & discord
+exec-once = discord & ags & waybar
 
 
 # Source a file (multi-file configs)
@@ -154,8 +154,9 @@ master {
 
 # https://wiki.hyprland.org/Configuring/Variables/#misc
 misc { 
-    force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
+    force_default_wallpaper = 2 # Set to 0 or 1 to disable the anime mascot wallpapers
     disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :(
+    disable_splash_rendering = true #disable splash text
 }
 
 
@@ -182,7 +183,7 @@ input {
 
 # https://wiki.hyprland.org/Configuring/Variables/#gestures
 gestures {
-    workspace_swipe = false
+    workspace_swipe = true
 }
 
 # Example per-device config
@@ -223,33 +224,33 @@ bind = $mainMod, 1, workspace, 1
 bind = $mainMod, 2, workspace, 2
 bind = $mainMod, 3, workspace, 3
 bind = $mainMod, 4, workspace, 4
-bind = $mainMod, parenleft, workspace, 5
-bind = $mainMod, minus, workspace, 6
-bind = $mainMod, egrave, workspace, 7
-bind = $mainMod, underscore, workspace, 8
-bind = $mainMod, ccedilla, workspace, 9
-bind = $mainMod, agrave, workspace, 10
+bind = $mainMod, 5, workspace, 5
+bind = $mainMod, 6, workspace, 6
+bind = $mainMod, 7, workspace, 7
+bind = $mainMod, 8, workspace, 8
+bind = $mainMod, 9, workspace, 9
+bind = $mainMod, 0, workspace, 10
 
 
 # Move active window to a workspace with mainMod + SHIFT + [0-9] (AZERTY FIX)
-bind = $mainMod SHIFT, ampersand, movetoworkspace, 1
-bind = $mainMod SHIFT, eacute, movetoworkspace, 2
-bind = $mainMod SHIFT, quotedbl, movetoworkspace, 3
-bind = $mainMod SHIFT, apostrophe, movetoworkspace, 4
-bind = $mainMod SHIFT, parenleft, movetoworkspace, 5
-bind = $mainMod SHIFT, minus, movetoworkspace, 6
-bind = $mainMod SHIFT, egrave, movetoworkspace, 7
-bind = $mainMod SHIFT, underscore, movetoworkspace, 8
-bind = $mainMod SHIFT, ccedilla, movetoworkspace, 9
-bind = $mainMod SHIFT, agrave, movetoworkspace, 10
+bind = $mainMod SHIFT, 1, movetoworkspace, 1
+bind = $mainMod SHIFT, 2, movetoworkspace, 2
+bind = $mainMod SHIFT, 3, movetoworkspace, 3
+bind = $mainMod SHIFT, 4, movetoworkspace, 4
+bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod SHIFT, 7, movetoworkspace, 7
+bind = $mainMod SHIFT, 8, movetoworkspace, 8
+bind = $mainMod SHIFT, 9, movetoworkspace, 9
+bind = $mainMod SHIFT, 0, movetoworkspace, 10
 
 # Example special workspace (scratchpad)
 bind = $mainMod, S, togglespecialworkspace, magic
 bind = $mainMod SHIFT, S, movetoworkspace, special:magic
 
 # Scroll through existing workspaces with mainMod + scroll
-bind = $mainMod, mouse_down, workspace, e+1
-bind = $mainMod, mouse_up, workspace, e-1
+bind = $mainMod, Right, workspace, e+1
+bind = $mainMod, Left, workspace, e-1
 
 # Move/resize windows with mainMod + LMB/RMB and dragging
 bindm = $mainMod, mouse:272, movewindow
diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf
index ec5b321..91e4c9c 100644
--- a/.config/hypr/hyprlock.conf
+++ b/.config/hypr/hyprlock.conf
@@ -38,7 +38,7 @@ label {
 # DATE 
 label {
     monitor =
-    text = cmd[update:1000] echo -e "$(date +"%A, %d %B")"
+    text = cmd[update:1000] echo "$(date +"%A, %d %B")"
     color = $text
     font_size = 30
     font_family = $font
diff --git a/.config/rofi/applets/bin/volume.sh b/.config/rofi/applets/bin/volume.sh
index e006377..b4bd5b1 100755
--- a/.config/rofi/applets/bin/volume.sh
+++ b/.config/rofi/applets/bin/volume.sh
@@ -66,15 +66,15 @@ fi
 # Options
 layout=`cat ${theme} | grep 'USE_ICON' | cut -d'=' -f2`
 if [[ "$layout" == 'NO' ]]; then
-	option_1=" Increase"
+	option_1=" Increase"
 	option_2="$sicon $stext"
-	option_3=" Decrese"
+	option_3=" Decrese"
 	option_4="$micon $mtext"
 	option_5=" Settings"
 else
-	option_1=""
+	option_1=""
 	option_2="$sicon"
-	option_3=""
+	option_3=""
 	option_4="$micon"
 	option_5=""
 fi
diff --git a/.config/rofi/powermenu/type-2/powermenu.sh b/.config/rofi/powermenu/type-2/powermenu.sh
index d2bdd51..d5a632e 100755
--- a/.config/rofi/powermenu/type-2/powermenu.sh
+++ b/.config/rofi/powermenu/type-2/powermenu.sh
@@ -23,7 +23,7 @@ shutdown='⏻'
 reboot='󰑓'
 lock=''
 suspend=''
-logout=''
+logout=''
 yes=''
 no=''
 
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
new file mode 100644
index 0000000..b10481d
--- /dev/null
+++ b/.config/waybar/config.jsonc
@@ -0,0 +1,108 @@
+{
+    "layer": "top", // Waybar at top layer
+    "position": "top", // Waybar position (top|bottom|left|right)
+    // "width": 1280, // Waybar width
+    // Choose the order of the modules
+    "modules-left": ["hyprland/workspaces", "custom/music","custom/vpn", "privacy"],
+    "modules-center": ["clock#date", "clock"],
+    "modules-right": ["battery","load", "custom/tomato", "pulseaudio", "tray", "custom/lock", "custom/power"],
+    "hyprland/workspaces": {
+         "disable-scroll": true,
+         "sort-by-name": true,
+         "format": " {icon} ",
+         "format-icons": {
+             "default": "",
+         },
+     },
+    "tray": {
+        "icon-size": 21,
+        "spacing": 10
+    },
+    "custom/music": {
+        "format": "  {}",
+        "escape": true,
+        "interval": 5,
+        "tooltip": false,
+        "exec": "playerctl metadata --format='{{ title }}'",
+        "on-click": "playerctl play-pause",
+        "max-length": 50
+    },
+    "privacy": {
+	    "icon-spacing": 4,
+	    "icon-size": 18,
+        "transition-duration": 250,
+	    "modules": [
+		    {
+			    "type": "screenshare",
+			    "tooltip": false,
+			    "tooltip-icon-size": 24
+		    },
+		    {
+			    "type": "audio-in",
+			    "tooltip": false,
+			    "tooltip-icon-size": 24
+		    }
+	    ]
+    },
+    "battery": {
+        "bat": "BAT0",
+        "interval": 60,
+        "states": {
+            "warning": 30,
+            "critical": 15
+        },
+        "format": "{capacity}% {icon}",
+        "format-icons": ["󰁺", "󰁼", "󰁾", "󰂀", "󱟢"],
+        "format-charging": "󰂄 {capacity}%",
+        "max-length": 25
+    },
+    "load": {
+        "interval": 1,
+        "format": " {load5}"
+    },
+    "clock": {
+        "timezone": "Europe/Paris",
+        "tooltip": false,
+        "format": " {:%H:%M}"
+    },
+    "clock#date": {
+        "timezone": "Europe/Paris",
+        "locale": "fr_FR.UTF-8",
+        "tooltip": false,
+        "format": "󰃭 {:%A %d/%m/%Y}",
+        "on-click": "gnome-calendar"
+    },
+    "pulseaudio": {
+        // "scroll-step": 1, // %, can be a float
+        "format": "{icon} {volume}%",
+        "format-muted": "",
+        "format-icons": {
+            "default": ["", "", " "]
+        }
+    },
+    "custom/tomato": {
+        "format": "{}",
+        "escape": true,
+        "interval": 1,
+        "tooltip": false,
+        "exec": "tomato -t",
+        "max-length": 10
+    },
+    "custom/lock": {
+        "tooltip": false,
+        "on-click": "hyprlock",
+        "format": "",
+    },
+    "custom/power": {
+        "tooltip": false,
+        "on-click": "~/.config/rofi/powermenu/type-2/powermenu.sh",
+        "format": "⏻"
+    },
+    "custom/vpn": {
+        "format": "VPN 󰌆",
+        "exec": "echo '{\"class\": \"connected\"}'",
+        "exec-if": "test -d /proc/sys/net/ipv4/conf/tun0",
+        "return-type": "json",
+        "interval": 5
+    }
+}
diff --git a/.config/waybar/macchiato.css b/.config/waybar/macchiato.css
new file mode 100644
index 0000000..12bc89c
--- /dev/null
+++ b/.config/waybar/macchiato.css
@@ -0,0 +1,37 @@
+/*
+*
+* Catppuccin Mocha palette
+* Maintainer: rubyowo
+*
+*/
+
+@define-color base   #24273a;
+@define-color mantle #1e2030;
+@define-color crust  #181926;
+
+@define-color text     #cad3f5;
+@define-color subtext0 #a5adcb;
+@define-color subtext1 #b8c0e0;
+
+@define-color surface0 #363a4f;
+@define-color surface1 #494d64;
+@define-color surface2 #5b6078;
+
+@define-color overlay0 #6e738d;
+@define-color overlay1 #8087a2;
+@define-color overlay2 #939ab7;
+
+@define-color blue      #8aadf4;
+@define-color lavender  #b7bdf8;
+@define-color sapphire  #7dc4e4;
+@define-color sky       #91d7e3;
+@define-color teal      #8bd5ca;
+@define-color green     #a6da95;
+@define-color yellow    #eed49f;
+@define-color peach     #f5a97f;
+@define-color maroon    #ee99a0;
+@define-color red       #ed8796;
+@define-color mauve     #c6a0f6;
+@define-color pink      #f5bde6;
+@define-color flamingo  #f0c6c6;
+@define-color rosewater #f4dbd6;
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
new file mode 100644
index 0000000..94ea704
--- /dev/null
+++ b/.config/waybar/style.css
@@ -0,0 +1,126 @@
+@import "macchiato.css";
+
+* {
+  font-family: JetBrainsMono Nerd Font;
+  font-size: 16px;
+  min-height: 0;
+}
+
+#waybar {
+  background: @base;
+  color: @text;
+  margin: 5px 5px;
+}
+
+#workspaces {
+  border-radius: 1rem;
+  margin: 5px;
+  background-color: @mantle;
+  margin-left: 1rem;
+  padding-right: 0.2rem;
+}
+
+#workspaces button {
+  color: @lavender;
+  border-radius: 1rem;
+  padding: 0.4rem;
+}
+
+#workspaces button.active {
+  color: @sky;
+  border-radius: 1rem;
+}
+
+#workspaces button:hover {
+  color: @sapphire;
+  border-radius: 1rem;
+}
+
+#battery,
+#load,
+#privacy,
+#custom-music,
+#tray,
+#backlight,
+#clock,
+#clock.date,
+#custom-tomato,
+#pulseaudio,
+#custom-lock,
+#custom-power,
+#custom-vpn {
+  background-color: @mantle;
+  padding: 0.5rem 1rem;
+  margin: 5px 0;
+}
+
+#clock {
+  color: @blue;
+  border-radius: 0px 1rem 1rem 0px;
+  margin-right: 1rem;
+}
+
+#clock.date {
+  border-radius: 1rem 0px 0px 1rem;
+}
+
+#load {
+  color: @peach;
+}
+
+#battery {
+  color: @green;
+  border-radius: 1rem 0px 0px 1rem;
+}
+
+#privacy {
+  color: @mauve;
+  border-radius: 1rem;
+}
+
+#custom-tomato {
+  color: @yellow;
+}
+
+#pulseaudio {
+  color: @maroon;
+  border-radius: 0px 1rem 1rem 0px;
+  margin-right: 1rem;
+}
+
+#custom-music {
+  color: @green;
+  border-radius: 1rem;
+  margin-right: 1rem;
+}
+
+#custom-lock {
+    border-radius: 1rem 0px 0px 1rem;
+    color: @lavender;
+}
+
+#custom-lock:hover {
+  color: @sapphire;
+}
+
+#custom-power {
+    margin-right: 1rem;
+    padding-right: 1.2rem;
+    border-radius: 0px 1rem 1rem 0px;
+    color: @red;
+}
+
+#custom-power:hover {
+  color: @peach;
+}
+
+#custom-vpn {
+  color: @pink;
+  border-radius: 1rem;
+  margin-right: 1rem;
+}
+
+#tray {
+  margin-right: 1rem;
+  border-radius: 1rem;
+}
diff --git a/.themes/Catppuccin-Macchiato-Standard-Blue-Dark/gtk-4.0/gtk-dark.css b/.themes/Catppuccin-Macchiato-Standard-Blue-Dark/gtk-4.0/gtk-dark.css
index ad8d617..6e698b3 100644
--- a/.themes/Catppuccin-Macchiato-Standard-Blue-Dark/gtk-4.0/gtk-dark.css
+++ b/.themes/Catppuccin-Macchiato-Standard-Blue-Dark/gtk-4.0/gtk-dark.css
@@ -108,7 +108,6 @@ gridview > child:selected {
 }
 
 gridview > child box {
-  border-spacing: 8px;
   margin: 12px;
 }
 
diff --git a/.themes/Catppuccin-Macchiato-Standard-Blue-Dark/gtk-4.0/gtk.css b/.themes/Catppuccin-Macchiato-Standard-Blue-Dark/gtk-4.0/gtk.css
index ad8d617..6e698b3 100644
--- a/.themes/Catppuccin-Macchiato-Standard-Blue-Dark/gtk-4.0/gtk.css
+++ b/.themes/Catppuccin-Macchiato-Standard-Blue-Dark/gtk-4.0/gtk.css
@@ -108,7 +108,6 @@ gridview > child:selected {
 }
 
 gridview > child box {
-  border-spacing: 8px;
   margin: 12px;
 }