diff --git a/home/system/batsignal/default.nix b/home/system/batsignal/default.nix
index e08b790..812874a 100644
--- a/home/system/batsignal/default.nix
+++ b/home/system/batsignal/default.nix
@@ -1 +1,6 @@
-{ services.batsignal.enable = true; }
+{
+  services.batsignal = {
+    enable = true;
+    extraArgs = [ "-c 10" "-w 30" "-f 97" ];
+  };
+}
diff --git a/home/system/hyprland/default.nix b/home/system/hyprland/default.nix
index 3ad5520..b935cb5 100644
--- a/home/system/hyprland/default.nix
+++ b/home/system/hyprland/default.nix
@@ -19,8 +19,6 @@
     brightnessctl
     gnome-themes-extra
     wlsunset
-    # xwayland
-    # xdg-desktop-portal-gtk
     qt5ct
     libva
     dconf
@@ -68,7 +66,6 @@
         "$mod, E, exec, ${pkgs.xfce.thunar}/bin/thunar" # Thunar
         "$mod, B, exec, ${pkgs.qutebrowser}/bin/qutebrowser" # Qutebrowser
         "$mod, K, exec, ${pkgs.bitwarden}/bin/bitwarden" # Bitwarden
-        "$mod, C, exec, ${pkgs.kitty}/bin/kitty --class peaclock peaclock" # Peaclock
         "$mod, L, exec, ${pkgs.hyprlock}/bin/hyprlock" # Lock
         "$mod, X, exec, powermenu" # Powermenu
         "$mod, SPACE, exec, menu" # Launcher
@@ -91,8 +88,6 @@
 
         "$mod, F2, exec, night-shift-off" # Turn off night shift
         "$mod, F3, exec, night-shift-on" # Turn on night shift
-
-        "$mod, F5, exec, ${pkgs.kitty}/bin/kitty --class floating zsh -c sound-output" # Choose sound output
       ] ++ (builtins.concatLists (builtins.genList (i:
         let ws = i + 1;
         in [
@@ -196,13 +191,7 @@
         };
       };
 
-      windowrule = [ "animation popin,^(wlogout)$" ];
-
       windowrulev2 = [
-        "float, class:peaclock"
-        "move 2% 78%, class:peaclock"
-        "size 30% 20%, class:peaclock"
-
         "float, class:floating"
         "size 40% 40%, class:floating"
         "move 30% 30%, class:floating"
diff --git a/home/system/hyprland/hypridle.nix b/home/system/hyprland/hypridle.nix
index 9b47503..10ce7c0 100644
--- a/home/system/hyprland/hypridle.nix
+++ b/home/system/hyprland/hypridle.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }: {
-  wayland.windowManager.hyprland.settings.exec-once =
-    [ "${pkgs.hypridle}/bin/hypridle" ];
+  # wayland.windowManager.hyprland.settings.exec-once =
+  #   [ "${pkgs.hypridle}/bin/hypridle" ];
 
   services.hypridle = {
     enable = true;
diff --git a/home/system/hyprland/hyprpanel.nix b/home/system/hyprland/hyprpanel.nix
index 86be8e7..da809d7 100644
--- a/home/system/hyprland/hyprpanel.nix
+++ b/home/system/hyprland/hyprpanel.nix
@@ -3,4 +3,157 @@
     [ "${pkgs.hyprpanel}/bin/hyprpanel" ];
 
   home.packages = with pkgs; [ hyprpanel ];
+
+  home.file.".cache/ags/hyprpanel/options.json" = {
+    text = ''
+      {
+        "theme.font.name": "${config.var.theme.font}",
+        "theme.font.size": "${toString config.var.theme.bar.font-size}px",
+        "theme.bar.outer_spacing": "${
+          if config.var.theme.bar.floating
+          && config.var.theme.bar.transparent then
+            "0"
+          else
+            "8"
+        }px",
+        "theme.bar.buttons.y_margins": "${
+          if config.var.theme.bar.floating
+          && config.var.theme.bar.transparent then
+            "0"
+          else
+            "8"
+        }px",
+        "theme.bar.buttons.spacing": "0.3em",
+        "theme.bar.buttons.radius": "${toString config.var.theme.rounding}px",
+        "theme.bar.floating": ${
+          if config.var.theme.bar.floating then "true" else "false"
+        },
+        "theme.bar.buttons.padding_x": "0.7rem",
+        "theme.bar.buttons.padding_y": "0.3rem",
+
+
+        "theme.bar.margin_top": "1.0em",
+        "theme.bar.margin_sides": "${toString config.var.theme.gaps-out}px",
+        "theme.bar.margin_bottom": "0px",
+        "theme.bar.border_radius": "0.4em",
+
+        "bar.launcher.icon": "",
+        "theme.bar.transparent": ${
+          if config.var.theme.bar.transparent then "true" else "false"
+        },
+        "bar.workspaces.show_numbered": false,
+        "bar.workspaces.workspaces": 5,
+        "bar.workspaces.monitorSpecific": true,
+        "bar.workspaces.hideUnoccupied": false,
+        "bar.windowtitle.label": true,
+        "bar.volume.label": false,
+        "bar.network.truncation_size": 7,
+        "bar.bluetooth.label": false,
+        "bar.clock.format": "%a %b %d  %I:%M %p",
+        "bar.notifications.show_total": true,
+        "theme.notification.border_radius": "${
+          toString config.var.theme.rounding
+        }px",
+        "theme.osd.enable": true,
+        "theme.osd.orientation": "vertical",
+        "theme.osd.location": "left",
+        "theme.osd.radius": "${toString config.var.theme.rounding}px",
+        "theme.osd.margins": "0px 0px 0px 10px",
+        "theme.osd.muted_zero": true,
+        "menus.clock.weather.location": "${config.var.location}",
+        "menus.clock.weather.key": "myapikey",
+        "menus.clock.weather.unit": "metric",
+        "menus.dashboard.powermenu.avatar.image": "$HOME/.profile_picture.png",
+        "menus.dashboard.powermenu.confirmation": false,
+        "menus.dashboard.shortcuts.left.shortcut1.tooltip": "Microsoft Edgez",
+        "menus.dashboard.shortcuts.left.shortcut1.command": "microsoft-edge-stablez",
+        "menus.dashboard.shortcuts.left.shortcut1.icon": "󰇩z",
+        "menus.dashboard.shortcuts.left.shortcut2.icon": "z",
+        "menus.dashboard.shortcuts.left.shortcut2.command": "spotify-launcherz",
+        "menus.dashboard.shortcuts.left.shortcut2.tooltip": "Spotifyz",
+        "menus.dashboard.shortcuts.left.shortcut3.icon": "z",
+        "menus.dashboard.shortcuts.left.shortcut3.command": "discordz",
+        "menus.dashboard.shortcuts.left.shortcut3.tooltip": "Discordz",
+        "menus.dashboard.shortcuts.left.shortcut4.icon": "z",
+        "menus.dashboard.shortcuts.left.shortcut4.command": "rofi -show drunz",
+        "menus.dashboard.shortcuts.left.shortcut4.tooltip": "Search Appsz",
+        "menus.dashboard.shortcuts.right.shortcut1.icon": "z",
+        "menus.dashboard.shortcuts.right.shortcut1.command": "hyprpicker -az",
+        "menus.dashboard.shortcuts.right.shortcut1.tooltip": "Color Pickerz",
+        "menus.dashboard.shortcuts.right.shortcut3.icon": "󰄀z",
+        "menus.dashboard.shortcuts.right.shortcut3.command": "bash -c \"$HOME/.config/ags/services/snapshot.sh\"z",
+        "menus.dashboard.shortcuts.right.shortcut3.tooltip": "Screenshotz",
+        "menus.dashboard.directories.left.directory1.label": "󰉍 Downloadsz",
+        "menus.dashboard.directories.left.directory1.command": "bash -c \"dolphin $HOME/Downloads/\"z",
+        "menus.dashboard.directories.left.directory2.label": "󰉏 Videosz",
+        "menus.dashboard.directories.left.directory2.command": "bash -c \"dolphin $HOME/Videos/\"z",
+        "menus.dashboard.directories.left.directory3.label": "󰚝 Projectsz",
+        "menus.dashboard.directories.left.directory3.command": "bash -c \"dolphin $HOME/Projects/\"z",
+        "menus.dashboard.directories.right.directory1.label": "󱧶 Documentsz",
+        "menus.dashboard.directories.right.directory1.command": "bash -c \"dolphin $HOME/Documents/\"z",
+        "menus.dashboard.directories.right.directory2.label": "󰉏 Picturesz",
+        "menus.dashboard.directories.right.directory2.command": "bash -c \"dolphin $HOME/Pictures/\"z",
+        "menus.dashboard.directories.right.directory3.label": "󱂵 Homez",
+        "menus.dashboard.directories.right.directory3.command": "bash -c \"dolphin $HOME/\"z",
+        "theme.bar.menus.monochrome": true,
+        "wallpaper.enable": false,
+        "theme.bar.menus.background": "#${config.var.theme.colors.bg}",
+        "theme.bar.menus.cards": "#${config.var.theme.colors.bgalt}",
+        "theme.bar.menus.card_radius": "${
+          toString config.var.theme.rounding
+        }px",
+        "theme.bar.menus.label": "#${config.var.theme.colors.fg}",
+        "theme.bar.menus.text": "#${config.var.theme.colors.fg}",
+        "theme.bar.menus.border.size": "${
+          toString config.var.theme.border-size
+        }px",
+        "theme.bar.menus.border.color": "#${config.var.theme.colors.accent}",
+        "theme.bar.menus.border.radius": "${
+          toString config.var.theme.rounding
+        }px",
+        "theme.bar.menus.popover.text": "#${config.var.theme.colors.fg}",
+        "theme.bar.menus.popover.background": "#${config.var.theme.colors.bgalt}",
+        "theme.bar.menus.listitems.active": "#${config.var.theme.colors.accent}",
+        "theme.bar.menus.icons.active": "#${config.var.theme.colors.accent}",
+        "theme.bar.menus.switch.enabled": "#${config.var.theme.colors.accent}",
+        "theme.bar.menus.check_radio_button.active": "#${config.var.theme.colors.accent}",
+        "theme.bar.menus.buttons.default": "#${config.var.theme.colors.accent}",
+        "theme.bar.menus.buttons.active": "#${config.var.theme.colors.accent}",
+        "theme.bar.menus.iconbuttons.active": "#${config.var.theme.colors.accent}",
+        "theme.bar.menus.progressbar.foreground": "#${config.var.theme.colors.accent}",
+        "theme.bar.menus.slider.primary": "#${config.var.theme.colors.accent}",
+        "theme.bar.menus.tooltip.background": "#${config.var.theme.colors.bgalt}",
+        "theme.bar.menus.tooltip.text": "#${config.var.theme.colors.fg}",
+        "theme.bar.menus.dropdownmenu.background": "#${config.var.theme.colors.bgalt}",
+        "theme.bar.menus.dropdownmenu.text": "#${config.var.theme.colors.fg}",
+        "theme.bar.background": "#${config.var.theme.colors.bg}",
+        "theme.bar.buttons.style": "default",
+        "theme.bar.buttons.monochrome": true,
+        "theme.bar.buttons.text": "#${config.var.theme.colors.fg}",
+        "theme.bar.buttons.background": "#${config.var.theme.colors.bgalt}",
+        "theme.bar.buttons.icon": "#${config.var.theme.colors.accent}",
+        "theme.bar.buttons.notifications.background": "#${config.var.theme.colors.bgalt}",
+        "theme.bar.buttons.hover": "#${config.var.theme.colors.bg}",
+        "theme.bar.buttons.notifications.hover": "#${config.var.theme.colors.bg}",
+        "theme.bar.buttons.notifications.total": "#${config.var.theme.colors.accent}",
+        "theme.bar.buttons.notifications.icon": "#${config.var.theme.colors.accent}",
+        "theme.notification.background": "#${config.var.theme.colors.bgalt}",
+        "theme.notification.actions.background": "#${config.var.theme.colors.accent}",
+        "theme.notification.actions.text": "#${config.var.theme.colors.fg}",
+        "theme.notification.label": "#${config.var.theme.colors.accent}",
+        "theme.notification.border": "#${config.var.theme.colors.bgalt}",
+        "theme.notification.text": "#${config.var.theme.colors.fgalt}",
+        "theme.notification.labelicon": "#${config.var.theme.colors.accent}",
+        "theme.osd.bar_color": "#${config.var.theme.colors.accent}",
+        "theme.osd.bar_overflow_color": "#${config.var.theme.colors.accentalt}",
+        "theme.osd.icon": "#${config.var.theme.colors.bg}",
+        "theme.osd.icon_container": "#${config.var.theme.colors.accent}",
+        "theme.osd.label": "#${config.var.theme.colors.accent}",
+        "theme.osd.bar_container": "#${config.var.theme.colors.bgalt}",
+        "theme.bar.menus.menu.media.background.color": "#${config.var.theme.colors.bgalt}",
+        "theme.bar.menus.menu.media.card.color": "#${config.var.theme.colors.bgalt}",
+        "theme.bar.menus.menu.media.card.tint": 90
+      }
+    '';
+  };
 }
diff --git a/home/system/hyprland/hyprpaper.nix b/home/system/hyprland/hyprpaper.nix
index b95a975..61ed30c 100644
--- a/home/system/hyprland/hyprpaper.nix
+++ b/home/system/hyprland/hyprpaper.nix
@@ -1,6 +1,6 @@
 { pkgs, config, ... }: {
-  wayland.windowManager.hyprland.settings.exec-once =
-    [ "${pkgs.hyprpaper}/bin/hyprpaper" ];
+  # wayland.windowManager.hyprland.settings.exec-once =
+  #   [ "${pkgs.hyprpaper}/bin/hyprpaper" ];
 
   services.hyprpaper = {
     enable = true;
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index 1a42714..d97a3f3 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -81,6 +81,9 @@
       source = ../../home/wallpapers;
     };
 
+    # Import or profile picture
+    file.".profile_picture.png" = { source = ./profile_picture.png; };
+
     # Don't touch this
     stateVersion = "24.05";
   };
diff --git a/hosts/laptop/profile_picture.png b/hosts/laptop/profile_picture.png
new file mode 100644
index 0000000..71c63c9
Binary files /dev/null and b/hosts/laptop/profile_picture.png differ
diff --git a/hosts/laptop/variables.nix b/hosts/laptop/variables.nix
index 4bd781a..f07416d 100644
--- a/hosts/laptop/variables.nix
+++ b/hosts/laptop/variables.nix
@@ -9,6 +9,7 @@
 
     keyboardLayout = "fr";
 
+    location = "Paris";
     timeZone = "Europe/Paris";
     defaultLocale = "en_US.UTF-8";
     extraLocale = "fr_FR.UTF-8";
diff --git a/hosts/themes/catppuccin.nix b/hosts/themes/catppuccin.nix
deleted file mode 100644
index d06f329..0000000
--- a/hosts/themes/catppuccin.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  wallpaper = "nix.png";
-
-  font = "SFProDisplay Nerd Font";
-  font-mono = "FiraCode Nerd Font Mono";
-  font-size = 13;
-
-  rounding = 11;
-  gaps-in = 15;
-  gaps-out = 15 * 2;
-  border-size = 5;
-  animation-speed = "medium"; # "fast" | "medium" | "slow"
-  fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
-
-  waybar = {
-    transparent = true;
-    float = true;
-    position = "top";
-    font-size = 15;
-  };
-
-  colors = {
-    c0 = "1e1e2e"; # black
-    c1 = "f38ba8"; # red
-    c2 = "a6e3a1"; # green
-    c3 = "fab387"; # yellow
-    c4 = "89b4fa"; # blue
-    c5 = "cba6f7"; # magenta
-    c6 = "74c7ec"; # cyan
-    c7 = "cdd6f4"; # white
-    c8 = "313244"; # bright black
-    c9 = "eba0ac"; # bright red
-    c10 = "94e2d5"; # bright green
-    c11 = "f9e2af"; # bright yellow
-    c12 = "b4befe"; # bright blue
-    c13 = "f5c2e7"; # bright magenta
-    c14 = "94e2d5"; # bright cyan
-    c15 = "bac2de"; # bright white
-
-    bg = "01010b";
-    fg = "cdd6f4";
-    bgalt = "181825";
-    fgalt = "bac2de";
-
-    accent = "89b4fa";
-    accentFg = "1e1e2e";
-
-    # Should make those automtic
-    accentName = "blue";
-    accentNumber = "4";
-  };
-}
diff --git a/hosts/themes/jack.nix b/hosts/themes/jack.nix
deleted file mode 100644
index d865bd5..0000000
--- a/hosts/themes/jack.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  wallpaper = "magma.png";
-
-  font = "SFProDisplay Nerd Font";
-  font-mono = "FiraCode Nerd Font Mono";
-  font-size = 14;
-
-  rounding = 8;
-  gaps-in = 8;
-  gaps-out = 8 * 2;
-  border-size = 2;
-  animation-speed = "slow"; # "fast" | "medium" | "slow"
-  fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
-
-  waybar = {
-    transparent = false;
-    float = false;
-    position = "bottom";
-    font-size = 16;
-  };
-
-  colors = {
-    c0 = "1e1e2e"; # black
-    c1 = "f38ba8"; # red
-    c2 = "a6e3a1"; # green
-    c3 = "fab387"; # yellow
-    c4 = "89b4fa"; # blue
-    c5 = "cba6f7"; # magenta
-    c6 = "74c7ec"; # cyan
-    c7 = "cdd6f4"; # white
-    c8 = "313244"; # bright black
-    c9 = "eba0ac"; # bright red
-    c10 = "94e2d5"; # bright green
-    c11 = "f9e2af"; # bright yellow
-    c12 = "b4befe"; # bright blue
-    c13 = "f5c2e7"; # bright magenta
-    c14 = "94e2d5"; # bright cyan
-    c15 = "bac2de"; # bright white
-
-    bg = "01010b";
-    fg = "cdd6f4";
-    bgalt = "181825";
-    fgalt = "bac2de";
-
-    accent = "f38ba8";
-    accentFg = "1e1e2e";
-
-    # Should make those automtic
-    accentName = "red";
-    accentNumber = "1";
-  };
-}
diff --git a/hosts/themes/nixy.nix b/hosts/themes/nixy.nix
index 26acd06..306e1ac 100644
--- a/hosts/themes/nixy.nix
+++ b/hosts/themes/nixy.nix
@@ -12,11 +12,10 @@
   animation-speed = "fast"; # "fast" | "medium" | "slow"
   fetch = "nerdfetch"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
 
-  waybar = {
-    transparent = true;
-    float = true;
-    position = "top";
-    font-size = 15;
+  bar = {
+    transparent = false;
+    floating = true;
+    font-size = 16;
   };
 
   colors = {
@@ -44,6 +43,7 @@
 
     accent = "A594FD";
     accentFg = "0B0B0B";
+    accentalt = "f5c2e7";
 
     # Should make those automtic
     accentName = "magenta";
diff --git a/hosts/themes/windows.nix b/hosts/themes/windows.nix
deleted file mode 100644
index 0ee8580..0000000
--- a/hosts/themes/windows.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  wallpaper = "windows.png";
-
-  font = "SFProDisplay Nerd Font";
-  font-mono = "FiraCode Nerd Font Mono";
-  font-size = 14;
-
-  rounding = 8;
-  gaps-in = 8;
-  gaps-out = 8 * 2;
-  border-size = 2;
-  animation-speed = "slow"; # "fast" | "medium" | "slow"
-  fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
-
-  waybar = {
-    transparent = false;
-    float = false;
-    position = "bottom";
-    font-size = 16;
-  };
-
-  colors = {
-    c0 = "1e1e2e"; # black
-    c1 = "f38ba8"; # red
-    c2 = "a6e3a1"; # green
-    c3 = "fab387"; # yellow
-    c4 = "89b4fa"; # blue
-    c5 = "cba6f7"; # magenta
-    c6 = "74c7ec"; # cyan
-    c7 = "cdd6f4"; # white
-    c8 = "313244"; # bright black
-    c9 = "eba0ac"; # bright red
-    c10 = "94e2d5"; # bright green
-    c11 = "f9e2af"; # bright yellow
-    c12 = "b4befe"; # bright blue
-    c13 = "f5c2e7"; # bright magenta
-    c14 = "94e2d5"; # bright cyan
-    c15 = "bac2de"; # bright white
-
-    bg = "01010b";
-    fg = "cdd6f4";
-    bgalt = "181825";
-    fgalt = "bac2de";
-
-    accent = "89b4fa";
-    accentFg = "1e1e2e";
-
-    # Should make those automtic
-    accentName = "blue";
-    accentNumber = "4";
-  };
-}