diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index 116de27..d87e9f2 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -85,39 +85,39 @@ scrolling:
 # Font configuration (changes require restart)
 font:
   # Normal (roman) font face
-  #normal:
+  normal:
     # Font family
     #
     # Default:monospace
-    #family: monospace
+    family: JetBrains Mono
 
     # The `style` can be specified to pick a specific face.
     #style: Regular
 
   # Bold font face
-  #bold:
+  bold:
     # Font family
     #
     # If the bold family is not specified, it will fall back to the
     # value specified for the normal font.
-    #family: monospace
+    family: JetBrains Mono
 
     # The `style` can be specified to pick a specific face.
     #style: Bold
 
   # Italic font face
-  #italic:
+  italic:
     # Font family
     #
     # If the italic family is not specified, it will fall back to the
     # value specified for the normal font.
-    #family: monospace
+    family: JetBrains Mono
 
     # The `style` can be specified to pick a specific face.
     #style: Italic
 
   # Point size
-  size: 12.0
+  size: 13.0
 
   # Offset is the extra space around each character. `offset.y` can be thought of
   # as modifying the line spacing, and `offset.x` as modifying the letter spacing.
diff --git a/.config/polybar/bars.ini b/.config/polybar/bars.ini
index 092a250..6f13b11 100644
--- a/.config/polybar/bars.ini
+++ b/.config/polybar/bars.ini
@@ -23,11 +23,11 @@
     module-margin-right = 2
 
     font-0 = fixed:pixelsize=10;1
-    font-1 = Font Awesome 5 Pro Regular:size=12
-    font-2 = Font Awesome 5 Pro Light:size=12
-    font-3 = Font Awesome 5 Pro Solid:size=12
-    font-4 = Font Awesome 5 Brands:size=12
-    font-5 = Font Awesome 5 Duotone Solid:size=12
+    font-1 = Font Awesome 6 Pro Regular:size=12
+    font-2 = Font Awesome 6 Pro Light:size=12
+    font-3 = Font Awesome 6 Pro Solid:size=12
+    font-4 = Font Awesome 6 Brands:size=12
+    font-5 = Font Awesome 6 Duotone Solid:size=12
     font-6 = PowerlineSymbols:size=12
 
     monitor = 
diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi
index 459ba95..91bd5cf 100644
--- a/.config/rofi/config.rasi
+++ b/.config/rofi/config.rasi
@@ -1,6 +1,6 @@
 configuration {
 	modi: "combi,ssh,run,window";
-	font: "hack 10";
+	font: "JetBrains Mono 13";
 	show-icons: true;
 	ssh-command: "{terminal} -e bash -ic "ssh {host} [-p {port}]"";
 	icon-theme: ""Papirus-Dark"";
diff --git a/.config/vim/vimrc b/.config/vim/vimrc
index 14c56a9..0d19ae3 100644
--- a/.config/vim/vimrc
+++ b/.config/vim/vimrc
@@ -1,14 +1,6 @@
 set runtimepath+=~/.config/vim,~/.config/vim/after
 set packpath+=~/.config/vim
 
-if has('nvim')
-    " Neovim specific commands
-    set viminfo+=n~/.cache/nviminfo
-else
-    " Standard vim specific commands
-    set viminfo+=n~/.cache/viminfo
-endif
-
 " Plug plugins using VimPlug
 call plug#begin('~/.config/vim/plugged')
     " Tools
@@ -75,6 +67,14 @@ set hlsearch
 set nowrap
 set nocompatible
 
+if has('nvim')
+    " Neovim specific commands
+    set viminfo+=n~/.cache/nviminfo
+else
+    " Standard vim specific commands
+    set viminfo+=n~/.cache/viminfo
+endif
+
 set wildmode=longest,list,full
 
 set fillchars+=vert:\ 
diff --git a/.config/zsh/custom/themes/serguzim.zsh-theme b/.config/zsh/custom/themes/serguzim.zsh-theme
index 1e6f9ec..2e1daae 100644
--- a/.config/zsh/custom/themes/serguzim.zsh-theme
+++ b/.config/zsh/custom/themes/serguzim.zsh-theme
@@ -5,7 +5,7 @@ ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✘ "
 
 PROMPT='%(?, ,%{$fg[red]%}RETURN: $?%{$reset_color%}
 )
-%{$fg[green]%}%* %{$fg[magenta]%}%n%{$reset_color%}@%{$fg[yellow]%}%M%{$reset_color%}: %{$fg_bold[blue]%}%~$(git_prompt_info)
-%{$fg_bold[green]%}❯%{$reset_color%} '
+%{$fg[red]%}%* %{$fg[yellow]%}%n%{$reset_color%}@%{$fg[magenta]%}%M%{$reset_color%}: %{$fg_bold[blue]%}%~$(git_prompt_info)
+%{$fg[green]%}$%{$reset_color%} '
 
 #RPROMPT='%{$fg[green]%}[%*]%{$reset_color%}'
diff --git a/.local/share/fonts/Font Awesome 5 Brands-Regular-400.otf.gpg b/.local/share/fonts/Font Awesome 5 Brands-Regular-400.otf.gpg
deleted file mode 100644
index 1217de3..0000000
Binary files a/.local/share/fonts/Font Awesome 5 Brands-Regular-400.otf.gpg and /dev/null differ
diff --git a/.local/share/fonts/Font Awesome 5 Duotone-Solid-900.otf.gpg b/.local/share/fonts/Font Awesome 5 Duotone-Solid-900.otf.gpg
deleted file mode 100644
index d312f74..0000000
Binary files a/.local/share/fonts/Font Awesome 5 Duotone-Solid-900.otf.gpg and /dev/null differ
diff --git a/.local/share/fonts/Font Awesome 5 Pro-Light-300.otf.gpg b/.local/share/fonts/Font Awesome 5 Pro-Light-300.otf.gpg
deleted file mode 100644
index 2fe5695..0000000
Binary files a/.local/share/fonts/Font Awesome 5 Pro-Light-300.otf.gpg and /dev/null differ
diff --git a/.local/share/fonts/Font Awesome 5 Pro-Regular-400.otf.gpg b/.local/share/fonts/Font Awesome 5 Pro-Regular-400.otf.gpg
deleted file mode 100644
index caef8a8..0000000
Binary files a/.local/share/fonts/Font Awesome 5 Pro-Regular-400.otf.gpg and /dev/null differ
diff --git a/.local/share/fonts/Font Awesome 5 Pro-Solid-900.otf.gpg b/.local/share/fonts/Font Awesome 5 Pro-Solid-900.otf.gpg
deleted file mode 100644
index 03c8681..0000000
Binary files a/.local/share/fonts/Font Awesome 5 Pro-Solid-900.otf.gpg and /dev/null differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMono-Bold.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMono-Bold.ttf
new file mode 100644
index 0000000..0cd1cb6
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMono-Bold.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMono-BoldItalic.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMono-BoldItalic.ttf
new file mode 100644
index 0000000..136d448
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMono-BoldItalic.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMono-ExtraBold.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMono-ExtraBold.ttf
new file mode 100644
index 0000000..de49a65
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMono-ExtraBold.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMono-ExtraBoldItalic.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMono-ExtraBoldItalic.ttf
new file mode 100644
index 0000000..357b69e
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMono-ExtraBoldItalic.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMono-ExtraLight.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMono-ExtraLight.ttf
new file mode 100644
index 0000000..73a1268
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMono-ExtraLight.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMono-ExtraLightItalic.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMono-ExtraLightItalic.ttf
new file mode 100644
index 0000000..7c7b1a1
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMono-ExtraLightItalic.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMono-Italic.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMono-Italic.ttf
new file mode 100644
index 0000000..d65e68c
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMono-Italic.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMono-Light.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMono-Light.ttf
new file mode 100644
index 0000000..3d54fe2
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMono-Light.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMono-LightItalic.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMono-LightItalic.ttf
new file mode 100644
index 0000000..8786f03
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMono-LightItalic.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMono-Medium.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMono-Medium.ttf
new file mode 100644
index 0000000..ae9a99e
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMono-Medium.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMono-MediumItalic.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMono-MediumItalic.ttf
new file mode 100644
index 0000000..68afaf6
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMono-MediumItalic.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMono-Regular.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMono-Regular.ttf
new file mode 100644
index 0000000..5f2f00f
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMono-Regular.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMono-Thin.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMono-Thin.ttf
new file mode 100644
index 0000000..35d16e6
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMono-Thin.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMono-ThinItalic.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMono-ThinItalic.ttf
new file mode 100644
index 0000000..da6fe4c
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMono-ThinItalic.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-Bold.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-Bold.ttf
new file mode 100644
index 0000000..d6a1a38
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-Bold.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-BoldItalic.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-BoldItalic.ttf
new file mode 100644
index 0000000..97065c7
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-BoldItalic.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-ExtraBold.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-ExtraBold.ttf
new file mode 100644
index 0000000..d48cc6f
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-ExtraBold.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-ExtraBoldItalic.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-ExtraBoldItalic.ttf
new file mode 100644
index 0000000..18ea280
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-ExtraBoldItalic.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-ExtraLight.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-ExtraLight.ttf
new file mode 100644
index 0000000..41413c1
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-ExtraLight.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-ExtraLightItalic.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-ExtraLightItalic.ttf
new file mode 100644
index 0000000..9d581e0
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-ExtraLightItalic.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-Italic.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-Italic.ttf
new file mode 100644
index 0000000..b8245bc
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-Italic.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-Light.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-Light.ttf
new file mode 100644
index 0000000..9579c0e
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-Light.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-LightItalic.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-LightItalic.ttf
new file mode 100644
index 0000000..6ee3131
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-LightItalic.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-Medium.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-Medium.ttf
new file mode 100644
index 0000000..eaae22d
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-Medium.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-MediumItalic.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-MediumItalic.ttf
new file mode 100644
index 0000000..206eeb6
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-MediumItalic.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-Regular.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-Regular.ttf
new file mode 100644
index 0000000..9d8b0a3
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-Regular.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-Thin.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-Thin.ttf
new file mode 100644
index 0000000..d149728
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-Thin.ttf differ
diff --git a/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-ThinItalic.ttf b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-ThinItalic.ttf
new file mode 100644
index 0000000..6502903
Binary files /dev/null and b/.local/share/fonts/jetbrains_mono/JetBrainsMonoNL-ThinItalic.ttf differ
diff --git a/.zprofile b/.zprofile
index 7f63a86..b0ebe32 100644
--- a/.zprofile
+++ b/.zprofile
@@ -1,12 +1,7 @@
-export VIMINIT='source ~/.config/vim/vimrc'
-export PASSWORD_STORE_GENERATED_LENGTH='64'
-export ZDOTDIR="$HOME/.config/zsh"
-
-source "$HOME/.config/environment"
+. "$HOME/.config/environment"
+. "$HOME/.config/aliasrc"
 
 if [ -x "$(command -v gpgconf)" ]; then
     export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
     gpgconf --launch gpg-agent
 fi
-
-[ -x "$(command -v mpd)" ] && mpd