diff --git a/.config/bootstrap/config_common b/.config/bootstrap/config_common
index 9caf47e..164531b 100644
--- a/.config/bootstrap/config_common
+++ b/.config/bootstrap/config_common
@@ -38,6 +38,7 @@ nm-connection-editor
 noto-fonts-emoji
 numlockx
 obsidian
+oh-my-posh
 oh-my-zsh-git
 pacman-contrib
 pass
diff --git a/.config/polybar/.env b/.config/polybar/.env
index 59e32e1..78aee2a 100644
--- a/.config/polybar/.env
+++ b/.config/polybar/.env
@@ -21,15 +21,15 @@ export BAR_TEMP_OK="%{F$MOCHA_MAUVE} %{F-} %temperature-c%"
 export BAR_TEMP_WARN="%{F$MOCHA_PEACH}  %{F-} %temperature-c%"
 export BAR_MENU_OPEN="%{F$MOCHA_MAUVE}%{F$MOCHA_TEXT}"
 export BAR_MENU_CLOSE="%{F$MOCHA_MAUVE}%{F$MOCHA_TEXT}"
-export BAR_BACKLIGHT="{F$MOCHA_SKY}☀️%{F$MOCHA_TEXT} %percentage%%"
-export BAR_BATTERY_FULL="%{$MOCHA_SAPPHIRE} %percentage%%"
-export BAR_BATTERY_CHARGING="${MOCHA_LAVENDER} %percentage%%"
-export BAR_BATTERY_DISCHARGIN="${MOCHA_PEACH} %percentage%%"
+export BAR_BACKLIGHT="%{F$MOCHA_SKY}☀️%{F$MOCHA_TEXT} %percentage%%"
+export BAR_BATTERY_FULL="%{F$MOCHA_SAPPHIRE} %{F$MOCHA_TEXT}%percentage%%"
+export BAR_BATTERY_CHARGING="%{F$MOCHA_LAVENDER} %{F$MOCHA_TEXT}%percentage%%"
+export BAR_BATTERY_DISCHARGING="%{F$MOCHA_PEACH} %{F$MOCHA_TEXT}%percentage%%"
 export BAR_MEMORY_DESKTOP="%{F$MOCHA_MAUVE}"
-export BAR_MEMORY_LAPTOP="%{F$MOCHA_MAUVE}%percentage_used%%"
-export BAR_MEMORY_LAPTOP_WARN="%{F$MOCHA_PEACH}%percentage_used%%"
+export BAR_MEMORY_LAPTOP="%{F$MOCHA_MAUVE}  %{F$MOCHA_TEXT}%percentage_used%%"
+export BAR_MEMORY_LAPTOP_WARN="%{F$MOCHA_PEACH}  %percentage_used%%"
 export BAR_DATE="%{F$MOCHA_MAUVE}🕓%{F$MOCHA_TEXT} %date%  ·  %time%"
 export BAR_LOW_VOL="%{F$MOCHA_MAUVE}🔈%{F$MOCHA_TEXT}"
 export BAR_MED_VOL="%{F$MOCHA_MAUVE}🔉%{F$MOCHA_TEXT}"
 export BAR_HIGH_VOL="%{F$MOCHA_MAUVE}🔊%{F$MOCHA_TEXT}"
-export BAR_HEAD_VOL="%{F$MOCHA_MAUVE}%{F$MOCHA_TEXT}"
+export BAR_HEAD_VOL="%{F$MOCHA_MAUVE}%%{F$MOCHA_TEXT}"
diff --git a/.config/polybar/config_common b/.config/polybar/config_common
index 6ea5cd4..6a71902 100644
--- a/.config/polybar/config_common
+++ b/.config/polybar/config_common
@@ -120,7 +120,7 @@ label-focused-font = 0
 label-focused-padding = 4
 
 label-unfocused = %icon%  %name%
-label-unfocused-underline = ${colors.surface1}
+label-unfocused-underline = ${colors.surface0}
 label-unfocused-font = 0
 label-unfocused-padding = 4
 
diff --git a/.config/polybar/scripts/filesystem.data.desk b/.config/polybar/scripts/filesystem.data.desk
index 825ff91..b291207 100644
--- a/.config/polybar/scripts/filesystem.data.desk
+++ b/.config/polybar/scripts/filesystem.data.desk
@@ -1,4 +1,4 @@
 #icons=(  )
 icons=( )
 #parts=(/ /home /mnt/backup)
-parts=(/ /home)
\ No newline at end of file
+parts=(/ /home)
diff --git a/.config/polybar/scripts/filesystem.sh b/.config/polybar/scripts/filesystem.sh
index 9f5b6ed..b3494db 100755
--- a/.config/polybar/scripts/filesystem.sh
+++ b/.config/polybar/scripts/filesystem.sh
@@ -16,7 +16,7 @@ for i in "${!parts[@]}"; do
 	else
 		color="$MOCHA_MAUVE"
 	fi
-	output=$output"%{F${color}}${icons[$i]}   $used%{F$MOCHA_TEXT}  ·  $avail"
+	output=$output"%{F${color}}${icons[$i]} $used%{F$MOCHA_TEXT}  ·  $avail"
 	if [ $(($i + 1)) -ne "${#parts[@]}" ] ; then
 		output=$output"               "
 	fi
diff --git a/.init_config.sh b/.init_config.sh
index e3276b5..f63e58a 100755
--- a/.init_config.sh
+++ b/.init_config.sh
@@ -121,13 +121,15 @@ if [ ! -z "$INIT" ]; then
 	pip install --break-system-packages pychee
 	# Additionnal plugins for ZSH
 	echo -e "* Install ZSH plugins for oh-my-zsh..."
-	sudo git clone https://github.com/zdharma-continuum/fast-syntax-highlighting.git /usr/share/oh-my-zsh/plugins/zsh-fast-syntax-highlighting
+	sudo git clone https://github.com/zdharma-continuum/fast-syntax-highlighting.git /usr/share/oh-my-zsh/plugins/fast-syntax-highlighting
 	sudo git clone https://github.com/zsh-users/zsh-autosuggestions /usr/share/oh-my-zsh/plugins/zsh-autosuggestions
 	sudo git clone https://github.com/unixorn/fzf-zsh-plugin.git /usr/share/oh-my-zsh/plugins/fzf-zsh-plugin
 	echo -e "* Install everything we need for Catppuccin themes..."
 	echo -e "\tFor polybar..."
-	wget https://github.com/catppuccin/polybar/blob/main/themes/mocha.ini -O ~/.config/polybar/mocha.ini
-	sudo wget https://raw.githubusercontent.com/catppuccin/zsh-fsh/main/themes/catppuccin-macchiato.ini -O /usr/share/oh-my-zsh/plugins/fast-syntax-highlighting
+	wget https://raw.githubusercontent.com/catppuccin/polybar/main/themes/mocha.ini -O ~/.config/polybar/mocha.ini
+ 	echo -e "\tFor zsh..."
+	sudo mkdir -p /usr/local/share/fsh
+	sudo wget https://raw.githubusercontent.com/catppuccin/zsh-fsh/main/themes/catppuccin-mocha.ini -O /usr/local/share/fsh/catppuccin-mocha.ini
 	# Basic directory structure
 	echo -e "* Create base home directories..."
 	mkdir -p ~/documents ~/images/screenshots ~/videos ~/downloads
diff --git a/.zshrc b/.zshrc
index ed9db7e..bafd94a 100644
--- a/.zshrc
+++ b/.zshrc
@@ -60,7 +60,7 @@ source $ZSH/oh-my-zsh.sh
 # Use Quick Term prompt theme made for Oh My Posh, in zsh
 eval "$(oh-my-posh init zsh --config https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/quick-term.omp.json)"
 
-# And use Catppuccin Mocha theme for ZSH fast hightlight plugin (LOCAL means searching in /usr/local/fsh)
+# And use Catppuccin Mocha theme for ZSH fast hightlight plugin (LOCAL means searching in /usr/local/share/fsh)
 fast-theme LOCAL:catppuccin-mocha >/dev/null
 
 # Preferred editor for local and remote sessions