diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index 3e02e42..0671042 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -10,6 +10,7 @@
 # to the user's home directory starting with `~/`.
 import:
   - ~/.config/alacritty/themes/catppuccin/catppuccin-macchiato.yml
+  # - ~/.config/alacritty/themes/gruvbox-dark.yaml
 
 # Any items in the `env` entry below will be added as
 # environment variables. Some entries may override variables
diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables
index a63530f..fea55f0 100644
--- a/.config/fish/fish_variables
+++ b/.config/fish/fish_variables
@@ -1,37 +1,37 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
 SETUVAR __fish_initialized:3400
-SETUVAR fish_color_autosuggestion:737994
-SETUVAR fish_color_cancel:e78284
-SETUVAR fish_color_command:8caaee
-SETUVAR fish_color_comment:838ba7
-SETUVAR fish_color_cwd:e5c890
+SETUVAR fish_color_autosuggestion:6e738d
+SETUVAR fish_color_cancel:ed8796
+SETUVAR fish_color_command:8aadf4
+SETUVAR fish_color_comment:8087a2
+SETUVAR fish_color_cwd:eed49f
 SETUVAR fish_color_cwd_root:red
-SETUVAR fish_color_end:ef9f76
-SETUVAR fish_color_error:e78284
-SETUVAR fish_color_escape:ea999c
-SETUVAR fish_color_gray:737994
+SETUVAR fish_color_end:f5a97f
+SETUVAR fish_color_error:ed8796
+SETUVAR fish_color_escape:ee99a0
+SETUVAR fish_color_gray:6e738d
 SETUVAR fish_color_history_current:\x2d\x2dbold
-SETUVAR fish_color_host:8caaee
-SETUVAR fish_color_host_remote:a6d189
-SETUVAR fish_color_keyword:e78284
-SETUVAR fish_color_normal:c6d0f5
-SETUVAR fish_color_operator:f4b8e4
+SETUVAR fish_color_host:8aadf4
+SETUVAR fish_color_host_remote:a6da95
+SETUVAR fish_color_keyword:ed8796
+SETUVAR fish_color_normal:cad3f5
+SETUVAR fish_color_operator:f5bde6
 SETUVAR fish_color_option:\x1d
-SETUVAR fish_color_param:eebebe
-SETUVAR fish_color_quote:a6d189
-SETUVAR fish_color_redirection:f4b8e4
-SETUVAR fish_color_search_match:\x2d\x2dbackground\x3d414559
-SETUVAR fish_color_selection:\x2d\x2dbackground\x3d414559
-SETUVAR fish_color_status:e78284
-SETUVAR fish_color_user:81c8be
+SETUVAR fish_color_param:f0c6c6
+SETUVAR fish_color_quote:a6da95
+SETUVAR fish_color_redirection:f5bde6
+SETUVAR fish_color_search_match:\x2d\x2dbackground\x3d363a4f
+SETUVAR fish_color_selection:\x2d\x2dbackground\x3d363a4f
+SETUVAR fish_color_status:ed8796
+SETUVAR fish_color_user:8bd5ca
 SETUVAR fish_color_valid_path:\x2d\x2dunderline
 SETUVAR fish_key_bindings:fish_vi_key_bindings
 SETUVAR fish_pager_color_background:\x1d
-SETUVAR fish_pager_color_completion:c6d0f5
-SETUVAR fish_pager_color_description:737994
-SETUVAR fish_pager_color_prefix:f4b8e4
-SETUVAR fish_pager_color_progress:737994
+SETUVAR fish_pager_color_completion:cad3f5
+SETUVAR fish_pager_color_description:6e738d
+SETUVAR fish_pager_color_prefix:f5bde6
+SETUVAR fish_pager_color_progress:6e738d
 SETUVAR fish_pager_color_secondary_background:\x1d
 SETUVAR fish_pager_color_secondary_completion:\x1d
 SETUVAR fish_pager_color_secondary_description:\x1d
@@ -40,5 +40,4 @@ SETUVAR fish_pager_color_selected_background:\x1d
 SETUVAR fish_pager_color_selected_completion:\x1d
 SETUVAR fish_pager_color_selected_description:\x1d
 SETUVAR fish_pager_color_selected_prefix:\x1d
-SETUVAR fish_user_paths:/home/tsousa/\x2econfig/emacs/bin\x1e/home/tsousa/\x2elocal/share/nvim/mason/bin\x1e/home/tsousa/\x2erustup/toolchains/nightly\x2dx86_64\x2dunknown\x2dlinux\x2dgnu/bin
 SETUVAR fish_user_paths:/home/tsousa/\x2econfig/emacs/bin\x1e/home/tsousa/\x2ecargo/bin\x1e/home/tsousa/\x2elocal/share/nvim/mason/bin\x1e/home/tsousa/\x2erustup/toolchains/nightly\x2dx86_64\x2dunknown\x2dlinux\x2dgnu/bin
diff --git a/.config/fish/functions/conf.fish b/.config/fish/functions/conf.fish
new file mode 100644
index 0000000..761c299
--- /dev/null
+++ b/.config/fish/functions/conf.fish
@@ -0,0 +1,3 @@
+function conf --wraps='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME' --description 'Git command to manage dotfiles'
+    /usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME $argv
+end
diff --git a/.config/fish/functions/config.fish b/.config/fish/functions/config.fish
deleted file mode 100644
index fbc7b3b..0000000
--- a/.config/fish/functions/config.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function config --wraps='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME' --description 'Git command to manage dotfiles'
-    /usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME $argv
-end
diff --git a/.config/fish/functions/fish_prompt.1666792935.copy b/.config/fish/functions/fish_prompt.1666792935.copy
deleted file mode 100644
index d58bf64..0000000
--- a/.config/fish/functions/fish_prompt.1666792935.copy
+++ /dev/null
@@ -1,30 +0,0 @@
-function fish_prompt --description 'Write out the prompt'
-    set -l last_status $status
-    set -l normal (set_color normal)
-    set -l status_color (set_color brgreen)
-    set -l cwd_color (set_color $fish_color_cwd)
-    set -l vcs_color (set_color brpurple)
-    set -l prompt_status ""
-
-    # Since we display the prompt on a new line allow the directory names to be longer.
-    set -q fish_prompt_pwd_dir_length
-    or set -lx fish_prompt_pwd_dir_length 0
-
-    # Color the prompt differently when we're root
-    set -l suffix '❯'
-    if functions -q fish_is_root_user; and fish_is_root_user
-        if set -q fish_color_cwd_root
-            set cwd_color (set_color $fish_color_cwd_root)
-        end
-        set suffix '#'
-    end
-
-    # Color the prompt in red on error
-    if test $last_status -ne 0
-        set status_color (set_color $fish_color_error)
-        set prompt_status $status_color "[" $last_status "]" $normal
-    end
-
-    echo -s (prompt_login) ' ' $cwd_color (prompt_pwd) $vcs_color (fish_vcs_prompt) $normal ' ' $prompt_status
-    echo -n -s $status_color $suffix ' ' $normal
-end
diff --git a/.config/fish/functions/fish_prompt.fish b/.config/fish/functions/fish_prompt.fish
deleted file mode 100644
index d58bf64..0000000
--- a/.config/fish/functions/fish_prompt.fish
+++ /dev/null
@@ -1,30 +0,0 @@
-function fish_prompt --description 'Write out the prompt'
-    set -l last_status $status
-    set -l normal (set_color normal)
-    set -l status_color (set_color brgreen)
-    set -l cwd_color (set_color $fish_color_cwd)
-    set -l vcs_color (set_color brpurple)
-    set -l prompt_status ""
-
-    # Since we display the prompt on a new line allow the directory names to be longer.
-    set -q fish_prompt_pwd_dir_length
-    or set -lx fish_prompt_pwd_dir_length 0
-
-    # Color the prompt differently when we're root
-    set -l suffix '❯'
-    if functions -q fish_is_root_user; and fish_is_root_user
-        if set -q fish_color_cwd_root
-            set cwd_color (set_color $fish_color_cwd_root)
-        end
-        set suffix '#'
-    end
-
-    # Color the prompt in red on error
-    if test $last_status -ne 0
-        set status_color (set_color $fish_color_error)
-        set prompt_status $status_color "[" $last_status "]" $normal
-    end
-
-    echo -s (prompt_login) ' ' $cwd_color (prompt_pwd) $vcs_color (fish_vcs_prompt) $normal ' ' $prompt_status
-    echo -n -s $status_color $suffix ' ' $normal
-end
diff --git a/.config/fish/functions/fish_right_prompt.fish b/.config/fish/functions/fish_right_prompt.fish
deleted file mode 100644
index c1b019e..0000000
--- a/.config/fish/functions/fish_right_prompt.fish
+++ /dev/null
@@ -1,2 +0,0 @@
-function fish_right_prompt
-end
diff --git a/.config/i3/config b/.config/i3/config
index 214edb5..eeff8a8 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -207,8 +207,8 @@ mode "resize" {
 bindsym $mod+r mode "resize"
 
 # window settings
-gaps inner 10
-gaps top 40
+gaps inner 5
+gaps top 37
 
 assign [class="^tidal-hifi$"] 5
 assign [class="discord"] 5
diff --git a/.config/nvim/after/plugin/statusline.lua b/.config/nvim/after/plugin/statusline.lua
index 79f55e8..1222892 100644
--- a/.config/nvim/after/plugin/statusline.lua
+++ b/.config/nvim/after/plugin/statusline.lua
@@ -2,7 +2,7 @@ require('lualine').setup {
   options = {
     icons_enabled = true,
     theme = 'auto',
-    component_separators = { left = '', right = ''},
+    component_separators = { left = '|', right = '|'},
     section_separators = { left = '', right = ''},
     disabled_filetypes = {
       statusline = {},
@@ -21,7 +21,7 @@ require('lualine').setup {
     lualine_a = {'mode'},
     lualine_b = {'branch', 'diff', 'diagnostics'},
     lualine_c = {'filename'},
-    lualine_x = {'encoding', 'fileformat', 'filetype'},
+    lualine_x = {'encoding', 'filetype'},
     lualine_y = {'progress'},
     lualine_z = {'location'}
   },
diff --git a/.config/polybar/config.ini b/.config/polybar/config.ini
index 947cba5..6ab9b1c 100644
--- a/.config/polybar/config.ini
+++ b/.config/polybar/config.ini
@@ -27,28 +27,27 @@ pseudo-transparency = true
 monitor = ${env:MONITOR:eDP1}
 tray-position  = ${env:TRAY_POS:right}
 
-font-0 = Firacode Nerd Font:style=medium:size=10;2
-font-1 = jetbrainsmono nerd font:size=10:weight=bold;2
+font-0 = JetbrainsMono Nerd Font:size=10:weight=medium;2
+font-1 = Firacode Nerd Font:style=medium:size=10;2
 font-2 = inter:size=10:weight=regular;2
 
 [bar/laptop]
 inherit = section/base
-width = 99.4%
+width = 99.5%
 height = 24pt
-offse-x = 0.3%
-offset-y = 0.7%
+offset-x = 0.3%
+offset-y = 0.5%
 ;radius = 8
 
 modules-left = i3 sep title
 modules-center = date dot time 
-modules-right = cpu dot gpu dot memory dot backlight dot pulseaudio sep filesystem sep battery 
+modules-right = cpu dot gpu dot memory dot backlight dot pulseaudio sep filesystem sep battery
 
 background = ${colors.base}
 foreground = ${colors.text}
 line-size = 3pt
 padding-right = 1
 
-
 cursor-click = pointer
 enable-ipc = true
 
diff --git a/.config/rofi/applets/shared/colors.rasi b/.config/rofi/applets/shared/colors.rasi
index 103ad63..8dc3385 100644
--- a/.config/rofi/applets/shared/colors.rasi
+++ b/.config/rofi/applets/shared/colors.rasi
@@ -15,4 +15,4 @@
 
 /* Import color-scheme from `colors` directory */
 
-@import "~/.config/rofi/colors/onedark.rasi"
+@import "~/.config/rofi/colors/catppuccin.rasi"
diff --git a/.config/rofi/applets/shared/theme.bash b/.config/rofi/applets/shared/theme.bash
index 1685854..8202ea2 100755
--- a/.config/rofi/applets/shared/theme.bash
+++ b/.config/rofi/applets/shared/theme.bash
@@ -1,4 +1,4 @@
 ## Current Theme
 
-type="$HOME/.config/rofi/applets/type-5"
-style='style-2.rasi'
+type="$HOME/.config/rofi/applets/type-4"
+style='style-1.rasi'
diff --git a/.config/rofi/launchers/type-6/style-10.rasi b/.config/rofi/launchers/type-6/style-10.rasi
index 07c375d..4343e53 100644
--- a/.config/rofi/launchers/type-6/style-10.rasi
+++ b/.config/rofi/launchers/type-6/style-10.rasi
@@ -21,7 +21,7 @@ configuration {
 
 /*****----- Global Properties -----*****/
 * {
-    font:                        "JetBrains Mono Nerd Font 10";
+    font:                        "JetBrains Mono Nerd Font 11";
     background:                  #11092D;
     background-alt:              #281657;
     foreground:                  #FFFFFF;
diff --git a/.config/rofi/launchers/type-7/launcher.sh b/.config/rofi/launchers/type-7/launcher.sh
index aa45aa9..dd4b507 100755
--- a/.config/rofi/launchers/type-7/launcher.sh
+++ b/.config/rofi/launchers/type-7/launcher.sh
@@ -11,7 +11,7 @@
 ## style-6     style-7     style-8     style-9     style-10
 
 dir="$HOME/.config/rofi/launchers/type-7"
-theme='style-1'
+theme='style-2'
 
 ## Run
 rofi \
diff --git a/.config/starship.toml b/.config/starship.toml
index 584fac7..c16f42c 100644
--- a/.config/starship.toml
+++ b/.config/starship.toml
@@ -2,6 +2,12 @@
 add_newline = false
 palette = "catppuccin_macchiato"
 
+[line_break]
+disabled = true
+
+[cmd_duration]
+disabled = true
+
 [aws]
 symbol = "  "