diff --git a/bin/docker-browse_volume b/bin/docker-browse_volume
new file mode 100755
index 0000000..9ca3bc6
--- /dev/null
+++ b/bin/docker-browse_volume
@@ -0,0 +1,4 @@
+#!/bin/sh
+mount_point="/mnt/${1}"
+docker run --rm -it -v "${1}:${mount_point}" -w "$mount_point" busybox sh
+
diff --git a/config/hypr/hyprland.conf.d/startup.conf b/config/hypr/hyprland.conf.d/startup.conf
index fe330dc..524d83f 100644
--- a/config/hypr/hyprland.conf.d/startup.conf
+++ b/config/hypr/hyprland.conf.d/startup.conf
@@ -4,7 +4,7 @@ exec-once = waybar
 exec-once = hyprpaper
 exec-once = artix-pipewire-launcher
 exec-once = /usr/lib/xdg-desktop-portal-hyprland
-exec-once = swayosd
+exec-once = swayosd-server
 exec-once = $terminal & $terminal -e sudo -i
 exec-once = webcord
 exec-once = joplin-desktop
diff --git a/config/sway/config.d/10-startup.conf b/config/sway/config.d/10-startup.conf
index dc25e8a..f90edd5 100644
--- a/config/sway/config.d/10-startup.conf
+++ b/config/sway/config.d/10-startup.conf
@@ -1,6 +1,6 @@
 exec --no-startup-id swaybg -i $wallpaper
 exec --no-startup-id swaync
-exec --no-startup-id swayosd
+exec --no-startup-id swayosd-server
 exec --no-startup-id xdg-session-start
 exec --no-startup-id $term
 exec --no-startup-id $term -e sudo -i
diff --git a/config/sway/config.d/70-bindings.conf b/config/sway/config.d/70-bindings.conf
index 8328e50..38b0b9a 100644
--- a/config/sway/config.d/70-bindings.conf
+++ b/config/sway/config.d/70-bindings.conf
@@ -64,11 +64,11 @@ bindsym $mod+space focus mode_toggle
 bindsym $mod+a focus parent
 
 # Control
-bindsym XF86AudioLowerVolume exec swayosd --output-volume=lower
-bindsym XF86AudioRaiseVolume exec swayosd --output-volume=raise
-bindsym XF86AudioMute exec swayosd --output-volume=mute-toggle
-bindsym XF86MonBrightnessUp exec swayosd --brightness=raise
-bindsym XF86MonBrightnessDown exec swayosd --brightness=lower
+bindsym XF86AudioLowerVolume exec swayosd-client --output-volume=lower
+bindsym XF86AudioRaiseVolume exec swayosd-client --output-volume=raise
+bindsym XF86AudioMute exec swayosd-client --output-volume=mute-toggle
+bindsym XF86MonBrightnessUp exec swayosd-client --brightness=raise
+bindsym XF86MonBrightnessDown exec swayosd-client --brightness=lower
 
 # Modes
 # Resize
diff --git a/config/waybar-hyprland/config b/config/waybar-hyprland/config
index 9f6e342..c9f6bd6 100644
--- a/config/waybar-hyprland/config
+++ b/config/waybar-hyprland/config
@@ -70,8 +70,8 @@
             "default": ["", "", ""]
         },
         "on-click": "pavucontrol -t 3",
-        "on-scroll-up": "swayosd --output-volume=raise",
-        "on-scroll-down": "swayosd --output-volume=lower"
+        "on-scroll-up": "swayosd-client --output-volume=raise",
+        "on-scroll-down": "swayosd-client --output-volume=lower"
 	},
 	"pulseaudio#input": {
         "format": "{format_source}",
@@ -87,8 +87,8 @@
             "default": ["", "", ""]
         },
         "on-click": "pavucontrol -t 4",
-        "on-scroll-up": "swayosd --input-volume=raise",
-        "on-scroll-down": "swayosd --input-volume=lower"
+        "on-scroll-up": "swayosd-client --input-volume=raise",
+        "on-scroll-down": "swayosd-client --input-volume=lower"
 	},
     "temperature": {
         "thermal-zone": 2,
diff --git a/etc/bash/bashrc.d/30-ahrc--laptop.bashrc b/etc/bash/bashrc.d/30-ahrc--laptop.bashrc
new file mode 100644
index 0000000..2dcbd5d
--- /dev/null
+++ b/etc/bash/bashrc.d/30-ahrc--laptop.bashrc
@@ -0,0 +1,3 @@
+ps1_brackets='()'
+ps1_color_1=32
+ps1_color_2=34
diff --git a/etc/bash/bashrc.d/30-ahrc--pc.bashrc b/etc/bash/bashrc.d/30-ahrc--pc.bashrc
new file mode 100644
index 0000000..7cd2ffd
--- /dev/null
+++ b/etc/bash/bashrc.d/30-ahrc--pc.bashrc
@@ -0,0 +1,3 @@
+ps1_brackets='[]'
+ps1_color_1=35
+ps1_color_2=34
diff --git a/etc/bash/bashrc.d/30-tera--io.bashrc b/etc/bash/bashrc.d/30-tera--io.bashrc
new file mode 100644
index 0000000..c2dba41
--- /dev/null
+++ b/etc/bash/bashrc.d/30-tera--io.bashrc
@@ -0,0 +1,5 @@
+ps1_brackets='{}'
+ps1_color_1=36
+ps1_color_2=34
+
+export SYSTEMD_PAGER=
diff --git a/etc/bash/bashrc.d/ahurac.bashrc b/etc/bash/bashrc.d/50-common_sh_directives.bashrc
similarity index 100%
rename from etc/bash/bashrc.d/ahurac.bashrc
rename to etc/bash/bashrc.d/50-common_sh_directives.bashrc
diff --git a/etc/bash/bashrc.d/50-ps1.bashrc b/etc/bash/bashrc.d/50-ps1.bashrc
new file mode 100644
index 0000000..e26a780
--- /dev/null
+++ b/etc/bash/bashrc.d/50-ps1.bashrc
@@ -0,0 +1,7 @@
+if [ "$(id -u)" -eq 0 ]; then
+    ps1_color_1=31
+    ps1_color_2=32
+fi
+
+PS1='\[\033[0m\]'"${ps1_brackets:0:1}"'\[\033[1;'"${ps1_color_1}"'m\]\u@\h\[\033[0m\] \[\033[1;'"${ps1_color_2}"'m\]\W\[\033[0m\]'"${ps1_brackets:1:1}"'\$ '
+
diff --git a/etc/bash/bashrc.d/ahrc-laptop.bashrc b/etc/bash/bashrc.d/ahrc-laptop.bashrc
deleted file mode 100644
index 69356c3..0000000
--- a/etc/bash/bashrc.d/ahrc-laptop.bashrc
+++ /dev/null
@@ -1,10 +0,0 @@
-# PS1
-if [ "$(id -u)" -eq 0 ]; then
-	ps1_color_1=1
-	ps1_color_2=10
-else
-	ps1_color_1=2
-	ps1_color_2=4
-fi
-export PS1="(\[$(tput sgr0)\]\[$(tput bold)\]\[\033[38;5;${ps1_color_1}m\]\u@\h\[$(tput sgr0)\] \[$(tput sgr0)\]\[$(tput bold)\]\[\033[38;5;${ps1_color_2}m\]\W\[$(tput sgr0)\])\\$ \[$(tput sgr0)\]"
-
diff --git a/etc/bash/bashrc.d/ahrc-pc.bashrc b/etc/bash/bashrc.d/ahrc-pc.bashrc
deleted file mode 100644
index 48ca71f..0000000
--- a/etc/bash/bashrc.d/ahrc-pc.bashrc
+++ /dev/null
@@ -1,10 +0,0 @@
-# PS1
-if [ "$(id -u)" -eq 0 ]; then
-	ps1_color_1=1
-	ps1_color_2=10
-else
-	ps1_color_1=5
-	ps1_color_2=4
-fi
-export PS1="[\[$(tput sgr0)\]\[$(tput bold)\]\[\033[38;5;${ps1_color_1}m\]\u@\h\[$(tput sgr0)\] \[$(tput sgr0)\]\[$(tput bold)\]\[\033[38;5;${ps1_color_2}m\]\W\[$(tput sgr0)\]]\\$ \[$(tput sgr0)\]"
-
diff --git a/etc/bash/bashrc.d/tera-io.bashrc b/etc/bash/bashrc.d/tera-io.bashrc
deleted file mode 100644
index 55f34ee..0000000
--- a/etc/bash/bashrc.d/tera-io.bashrc
+++ /dev/null
@@ -1,12 +0,0 @@
-# PS1
-if [ "$(id -u)" -eq 0 ]; then
-	ps1_color_1=1
-	ps1_color_2=10
-else
-	ps1_color_1=6
-	ps1_color_2=4
-fi
-export PS1="{\[$(tput sgr0)\]\[$(tput bold)\]\[\033[38;5;${ps1_color_1}m\]\u@\h\[$(tput sgr0)\] \[$(tput sgr0)\]\[$(tput bold)\]\[\033[38;5;${ps1_color_2}m\]\W\[$(tput sgr0)\]}\\$ \[$(tput sgr0)\]"
-
-export SYSTEMD_PAGER=
-
diff --git a/etc/sh/shrc.d/arch_aliases.bashrc b/etc/sh/shrc.d/arch_aliases
similarity index 100%
rename from etc/sh/shrc.d/arch_aliases.bashrc
rename to etc/sh/shrc.d/arch_aliases
diff --git a/etc/sh/shrc.d/aliases.bashrc b/etc/sh/shrc.d/core_aliases
similarity index 100%
rename from etc/sh/shrc.d/aliases.bashrc
rename to etc/sh/shrc.d/core_aliases
diff --git a/etc/sh/shrc.d/functions.bashrc b/etc/sh/shrc.d/core_functions
similarity index 100%
rename from etc/sh/shrc.d/functions.bashrc
rename to etc/sh/shrc.d/core_functions
diff --git a/home/gitconfig b/home/gitconfig
index 22a8f95..22e504c 100644
--- a/home/gitconfig
+++ b/home/gitconfig
@@ -2,7 +2,7 @@
 	name = Hippolyte Chauvin
 	email = hchauvin38@outlook.fr
 [core]
-	editor = hx
+	editor = nvim
 [init]
 	defaultbranch = main
 [pull]