diff --git a/.config/nvim/after/plugin/autoclose.lua b/.config/nvim/after/plugin/autoclose.lua
new file mode 100644
index 0000000..ac6e4c7
--- /dev/null
+++ b/.config/nvim/after/plugin/autoclose.lua
@@ -0,0 +1,24 @@
+require("autoclose").setup({
+    keys = {
+        ["("] = { escape = false, close = true, pair = "()", disabled_filetypes = {} },
+        ["["] = { escape = false, close = true, pair = "[]", disabled_filetypes = {} },
+        ["{"] = { escape = false, close = true, pair = "{}", disabled_filetypes = {} },
+
+        [">"] = { escape = true, close = false, pair = "<>", disabled_filetypes = {} },
+        [")"] = { escape = true, close = false, pair = "()", disabled_filetypes = {} },
+        ["]"] = { escape = true, close = false, pair = "[]", disabled_filetypes = {} },
+        ["}"] = { escape = true, close = false, pair = "{}", disabled_filetypes = {} },
+
+        ['"'] = { escape = true, close = true, pair = '""', disabled_filetypes = {"gitcommit", "tex"} },
+        ["'"] = { escape = true, close = true, pair = "''", disabled_filetypes = {"gitcommit", "tex"} },
+        ["`"] = { escape = true, close = true, pair = "``", disabled_filetypes = {"gitcommit", "tex"} },
+
+        ["$"] = { escape = true, close = true, pair = "$$", enabled_filetypes = {"tex"} },
+    },
+    options = {
+        disabled_filetypes = { "text" },
+        disable_when_touch = false,
+        pair_spaces = false,
+        auto_indent = true,
+    },
+})
diff --git a/.config/nvim/after/plugin/indent-blanklines.lua b/.config/nvim/after/plugin/indent-blanklines.lua
new file mode 100644
index 0000000..7ced543
--- /dev/null
+++ b/.config/nvim/after/plugin/indent-blanklines.lua
@@ -0,0 +1,28 @@
+-- Rainbow indent lines
+
+local highlight = {
+    "RainbowRed",
+    "RainbowYellow",
+    "RainbowBlue",
+    "RainbowOrange",
+    "RainbowGreen",
+    "RainbowViolet",
+    "RainbowCyan",
+}
+local hooks = require "ibl.hooks"
+-- create the highlight groups in the highlight setup hook, so they are reset
+-- every time the colorscheme changes
+hooks.register(hooks.type.HIGHLIGHT_SETUP, function()
+    vim.api.nvim_set_hl(0, "RainbowRed", { fg = "#E06C75" })
+    vim.api.nvim_set_hl(0, "RainbowYellow", { fg = "#E5C07B" })
+    vim.api.nvim_set_hl(0, "RainbowBlue", { fg = "#61AFEF" })
+    vim.api.nvim_set_hl(0, "RainbowOrange", { fg = "#D19A66" })
+    vim.api.nvim_set_hl(0, "RainbowGreen", { fg = "#98C379" })
+    vim.api.nvim_set_hl(0, "RainbowViolet", { fg = "#C678DD" })
+    vim.api.nvim_set_hl(0, "RainbowCyan", { fg = "#56B6C2" })
+end)
+
+vim.g.rainbow_delimiters = { highlight = highlight }
+require("ibl").setup { scope = { highlight = highlight } }
+
+hooks.register(hooks.type.SCOPE_HIGHLIGHT, hooks.builtin.scope_highlight_from_extmark)
diff --git a/.config/nvim/after/plugin/luasnip.lua b/.config/nvim/after/plugin/luasnip.lua
new file mode 100644
index 0000000..9173298
--- /dev/null
+++ b/.config/nvim/after/plugin/luasnip.lua
@@ -0,0 +1,12 @@
+require("luasnip.loaders.from_snipmate").load({ path = { "$HOME/.config/nvim/snippets/" } })
+
+local ls = require("luasnip")
+vim.keymap.set({"i"}, "<C-K>", function() ls.expand() end, {silent = true})
+vim.keymap.set({"i", "s"}, "<C-D>", function() ls.jump( 1) end, {silent = true})
+vim.keymap.set({"i", "s"}, "<C-S>", function() ls.jump(-1) end, {silent = true})
+
+vim.keymap.set({"i", "s"}, "<C-E>", function()
+	if ls.choice_active() then
+		ls.change_choice(1)
+	end
+end, {silent = true})
diff --git a/.config/nvim/after/plugin/presence.lua b/.config/nvim/after/plugin/presence.lua
new file mode 100644
index 0000000..fc3c5d2
--- /dev/null
+++ b/.config/nvim/after/plugin/presence.lua
@@ -0,0 +1,25 @@
+-- The setup config table shows all available config options with their default values:
+require("presence").setup({
+    -- General options
+    auto_update         = true,                 -- Update activity based on autocmd events (if `false`, map or manually execute `:lua package.loaded.presence:update()`)
+    -- neovim_image_text   = "The One True Text Editor", -- Text displayed when hovered over the Neovim image
+    neovim_image_text   = "Neovim",             -- Text displayed when hovered over the Neovim image
+    main_image          = "file",               -- Main image display (either "neovim" or "file")
+    client_id           = "793271441293967371", -- Use your own Discord application client id (not recommended)
+    log_level           = nil,                  -- Log messages at or above this level (one of the following: "debug", "info", "warn", "error")
+    debounce_timeout    = 1,                    -- Number of seconds to debounce events (or calls to `:lua package.loaded.presence:update(<filename>, true)`)
+    enable_line_number  = false,                -- Displays the current line number instead of the current project
+    blacklist           = {},                   -- A list of strings or Lua patterns that disable Rich Presence if the current file name, path, or workspace matches
+    buttons             = true,                 -- Configure Rich Presence button(s), either a boolean to enable/disable, a static table (`{{ label = "<label>", url = "<url>" }, ...}`, or a function(buffer: string, repo_url: string|nil): table)
+    file_assets         = {},                   -- Custom file asset definitions keyed by file names and extensions (see default config at `lua/presence/file_assets.lua` for reference)
+    show_time           = true,                 -- Show the timer
+
+    -- Rich Presence text options
+    editing_text        = "Editing %s",         -- Format string rendered when an editable file is loaded in the buffer (either string or function(filename: string): string)
+    file_explorer_text  = "Browsing %s",        -- Format string rendered when browsing a file explorer (either string or function(file_explorer_name: string): string)
+    git_commit_text     = "Committing changes", -- Format string rendered when committing changes in git (either string or function(filename: string): string)
+    plugin_manager_text = "Managing plugins",   -- Format string rendered when managing plugins (either string or function(plugin_manager_name: string): string)
+    reading_text        = "Reading %s",         -- Format string rendered when a read-only or unmodifiable file is loaded in the buffer (either string or function(filename: string): string)
+    workspace_text      = "Working on %s",      -- Format string rendered when in a git repository (either string or function(project_name: string|nil, filename: string): string)
+    line_number_text    = "Line %s out of %s",  -- Format string rendered when `enable_line_number` is set to true (either string or function(line_number: number, line_count: number): string)
+})
diff --git a/.config/nvim/after/plugin/tabset.lua b/.config/nvim/after/plugin/tabset.lua
new file mode 100644
index 0000000..cc669b4
--- /dev/null
+++ b/.config/nvim/after/plugin/tabset.lua
@@ -0,0 +1,18 @@
+require("tabset").setup({
+    defaults = {
+        tabwidth = 4,
+        expandtab = true
+    },
+    languages = {
+        asm = {
+            tabwidth = 8,
+            expandtab = false
+        },
+        {
+            filetypes = { "html", "json", "yaml" },
+            config = {
+                tabwidth = 2
+            }
+        }
+    }
+})
diff --git a/.config/nvim/lua/tiagorg/init.lua b/.config/nvim/lua/tiagorg/init.lua
index 26621f4..80ec255 100644
--- a/.config/nvim/lua/tiagorg/init.lua
+++ b/.config/nvim/lua/tiagorg/init.lua
@@ -1,142 +1,4 @@
 require("tiagorg.set")
+require("tiagorg.remap")
 
 vim.g.copilot_node_command = "~/.nodenv/bin/nodenv"
-
-vim.keymap.set("n", "<leader>e", vim.cmd.E)
-vim.keymap.set("n", "<leader>w", vim.cmd.w)
-
-vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
-vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
-
-vim.keymap.set("n", "J", "mzJ`z")
-vim.keymap.set("n", "<C-d>", "<C-d>zz")
-vim.keymap.set("n", "<C-u>", "<C-u>zz")
-vim.keymap.set("n", "n", "nzzzv")
-vim.keymap.set("n", "N", "Nzzzv")
-
--- greatest remap ever
-vim.keymap.set("x", "<leader>p", [["_dP]])
-
--- next greatest remap ever : asbjornHaland
-vim.keymap.set({ "n", "v" }, "<leader>y", [["+y]])
-vim.keymap.set("n", "<leader>Y", [["+Y]])
-
-vim.keymap.set({ "n", "v" }, "<leader>d", [["_d]])
-
--- This is going to get me cancelled
-vim.keymap.set("i", "<C-c>", "<Esc>")
-
-vim.keymap.set("n", "Q", "<nop>")
-vim.keymap.set("n", "<C-f>", "<cmd>silent !tmux neww tmux-sessionizer<CR>")
-vim.keymap.set("n", "<leader>f", vim.lsp.buf.format)
-
-vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz")
-vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz")
-vim.keymap.set("n", "<leader>k", "<cmd>lnext<CR>zz")
-vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz")
-
-vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
-vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", { silent = true })
-
-vim.keymap.set("n", "<leader>vpp", "<cmd>e ~/.config/nvim/lua/tiagorg/packer.lua<CR>");
-vim.keymap.set("n", "<leader>mr", "<cmd>CellularAutomaton make_it_rain<CR>");
-
-vim.keymap.set("n", "<leader><leader>", function()
-    vim.cmd("so")
-end)
-
-vim.api.nvim_set_keymap("i", "<C-Q>", "copilot#Accept(\"<CR>\")", { expr = true, silent = true })
--- Discord
-
--- The setup config table shows all available config options with their default values:
-require("presence").setup({
-    -- General options
-    auto_update         = true,                 -- Update activity based on autocmd events (if `false`, map or manually execute `:lua package.loaded.presence:update()`)
-    -- neovim_image_text   = "The One True Text Editor", -- Text displayed when hovered over the Neovim image
-    neovim_image_text   = "Neovim",             -- Text displayed when hovered over the Neovim image
-    main_image          = "file",               -- Main image display (either "neovim" or "file")
-    client_id           = "793271441293967371", -- Use your own Discord application client id (not recommended)
-    log_level           = nil,                  -- Log messages at or above this level (one of the following: "debug", "info", "warn", "error")
-    debounce_timeout    = 1,                    -- Number of seconds to debounce events (or calls to `:lua package.loaded.presence:update(<filename>, true)`)
-    enable_line_number  = false,                -- Displays the current line number instead of the current project
-    blacklist           = {},                   -- A list of strings or Lua patterns that disable Rich Presence if the current file name, path, or workspace matches
-    buttons             = true,                 -- Configure Rich Presence button(s), either a boolean to enable/disable, a static table (`{{ label = "<label>", url = "<url>" }, ...}`, or a function(buffer: string, repo_url: string|nil): table)
-    file_assets         = {},                   -- Custom file asset definitions keyed by file names and extensions (see default config at `lua/presence/file_assets.lua` for reference)
-    show_time           = true,                 -- Show the timer
-
-    -- Rich Presence text options
-    editing_text        = "Editing %s",         -- Format string rendered when an editable file is loaded in the buffer (either string or function(filename: string): string)
-    file_explorer_text  = "Browsing %s",        -- Format string rendered when browsing a file explorer (either string or function(file_explorer_name: string): string)
-    git_commit_text     = "Committing changes", -- Format string rendered when committing changes in git (either string or function(filename: string): string)
-    plugin_manager_text = "Managing plugins",   -- Format string rendered when managing plugins (either string or function(plugin_manager_name: string): string)
-    reading_text        = "Reading %s",         -- Format string rendered when a read-only or unmodifiable file is loaded in the buffer (either string or function(filename: string): string)
-    workspace_text      = "Working on %s",      -- Format string rendered when in a git repository (either string or function(project_name: string|nil, filename: string): string)
-    line_number_text    = "Line %s out of %s",  -- Format string rendered when `enable_line_number` is set to true (either string or function(line_number: number, line_count: number): string)
-})
-
--- Rainbow indent lines
-
-local highlight = {
-    "RainbowRed",
-    "RainbowYellow",
-    "RainbowBlue",
-    "RainbowOrange",
-    "RainbowGreen",
-    "RainbowViolet",
-    "RainbowCyan",
-}
-local hooks = require "ibl.hooks"
--- create the highlight groups in the highlight setup hook, so they are reset
--- every time the colorscheme changes
-hooks.register(hooks.type.HIGHLIGHT_SETUP, function()
-    vim.api.nvim_set_hl(0, "RainbowRed", { fg = "#E06C75" })
-    vim.api.nvim_set_hl(0, "RainbowYellow", { fg = "#E5C07B" })
-    vim.api.nvim_set_hl(0, "RainbowBlue", { fg = "#61AFEF" })
-    vim.api.nvim_set_hl(0, "RainbowOrange", { fg = "#D19A66" })
-    vim.api.nvim_set_hl(0, "RainbowGreen", { fg = "#98C379" })
-    vim.api.nvim_set_hl(0, "RainbowViolet", { fg = "#C678DD" })
-    vim.api.nvim_set_hl(0, "RainbowCyan", { fg = "#56B6C2" })
-end)
-
-vim.g.rainbow_delimiters = { highlight = highlight }
-require("ibl").setup { scope = { highlight = highlight } }
-
-hooks.register(hooks.type.SCOPE_HIGHLIGHT, hooks.builtin.scope_highlight_from_extmark)
-
-------------------------------------
-
-require("autoclose").setup({
-    keys = {
-        ["("] = { escape = false, close = true, pair = "()", disabled_filetypes = {} },
-        ["["] = { escape = false, close = true, pair = "[]", disabled_filetypes = {} },
-        ["{"] = { escape = false, close = true, pair = "{}", disabled_filetypes = {} },
-
-        [">"] = { escape = true, close = false, pair = "<>", disabled_filetypes = {} },
-        [")"] = { escape = true, close = false, pair = "()", disabled_filetypes = {} },
-        ["]"] = { escape = true, close = false, pair = "[]", disabled_filetypes = {} },
-        ["}"] = { escape = true, close = false, pair = "{}", disabled_filetypes = {} },
-
-        ['"'] = { escape = true, close = true, pair = '""', disabled_filetypes = {} },
-        ["'"] = { escape = true, close = true, pair = "''", disabled_filetypes = {} },
-        ["`"] = { escape = true, close = true, pair = "``", disabled_filetypes = {} },
-    },
-    options = {
-        disabled_filetypes = { "text" },
-        disable_when_touch = false,
-        pair_spaces = false,
-        auto_indent = true,
-    },
-})
-
-require("luasnip.loaders.from_snipmate").load({ path = { "$HOME/.config/nvim/snippets/" } })
-
-local ls = require("luasnip")
-vim.keymap.set({"i"}, "<C-K>", function() ls.expand() end, {silent = true})
-vim.keymap.set({"i", "s"}, "<C-D>", function() ls.jump( 1) end, {silent = true})
-vim.keymap.set({"i", "s"}, "<C-S>", function() ls.jump(-1) end, {silent = true})
-
-vim.keymap.set({"i", "s"}, "<C-E>", function()
-	if ls.choice_active() then
-		ls.change_choice(1)
-	end
-end, {silent = true})
diff --git a/.config/nvim/lua/tiagorg/packer.lua b/.config/nvim/lua/tiagorg/packer.lua
index fdbd462..bbee707 100644
--- a/.config/nvim/lua/tiagorg/packer.lua
+++ b/.config/nvim/lua/tiagorg/packer.lua
@@ -62,4 +62,11 @@ return require('packer').startup(function(use)
         -- install jsregexp (optional!:).
         run = "make install_jsregexp"
     })
+
+    use {
+        "FotiadisM/tabset.nvim",
+        config = function()
+            require("tabset").setup()
+        end
+    }
 end)
diff --git a/.config/nvim/lua/tiagorg/remap.lua b/.config/nvim/lua/tiagorg/remap.lua
index cebad99..cc15d95 100644
--- a/.config/nvim/lua/tiagorg/remap.lua
+++ b/.config/nvim/lua/tiagorg/remap.lua
@@ -1,4 +1,6 @@
 vim.keymap.set("n", "<leader>e", vim.cmd.E)
+vim.keymap.set("n", "<leader>w", vim.cmd.w)
+vim.keymap.set("n", "<leader>t", "<cmd>SetTabWidth 4 true<CR>")
 
 vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
 vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
@@ -13,10 +15,10 @@ vim.keymap.set("n", "N", "Nzzzv")
 vim.keymap.set("x", "<leader>p", [["_dP]])
 
 -- next greatest remap ever : asbjornHaland
-vim.keymap.set({"n", "v"}, "<leader>y", [["+y]])
+vim.keymap.set({ "n", "v" }, "<leader>y", [["+y]])
 vim.keymap.set("n", "<leader>Y", [["+Y]])
 
-vim.keymap.set({"n", "v"}, "<leader>d", [["_d]])
+vim.keymap.set({ "n", "v" }, "<leader>d", [["_d]])
 
 -- This is going to get me cancelled
 vim.keymap.set("i", "<C-c>", "<Esc>")
diff --git a/.config/nvim/lua/tiagorg/set.lua b/.config/nvim/lua/tiagorg/set.lua
index b581ced..14a0ad8 100644
--- a/.config/nvim/lua/tiagorg/set.lua
+++ b/.config/nvim/lua/tiagorg/set.lua
@@ -3,11 +3,6 @@
 vim.opt.nu = true
 vim.opt.relativenumber = true
 
-vim.opt.tabstop = 4
-vim.opt.softtabstop = 4
-vim.opt.shiftwidth = 4
-vim.opt.expandtab = true
-
 vim.opt.smartindent = true
 
 vim.opt.wrap = false
diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua
index d981554..ee56efa 100644
--- a/.config/nvim/plugin/packer_compiled.lua
+++ b/.config/nvim/plugin/packer_compiled.lua
@@ -49,8 +49,8 @@ local function save_profiles(threshold)
 end
 
 time([[Luarocks path setup]], true)
-local package_path_str = "/home/tiagorg/.cache/nvim/packer_hererocks/2.1.1696795921/share/lua/5.1/?.lua;/home/tiagorg/.cache/nvim/packer_hererocks/2.1.1696795921/share/lua/5.1/?/init.lua;/home/tiagorg/.cache/nvim/packer_hererocks/2.1.1696795921/lib/luarocks/rocks-5.1/?.lua;/home/tiagorg/.cache/nvim/packer_hererocks/2.1.1696795921/lib/luarocks/rocks-5.1/?/init.lua"
-local install_cpath_pattern = "/home/tiagorg/.cache/nvim/packer_hererocks/2.1.1696795921/lib/lua/5.1/?.so"
+local package_path_str = "/home/tiagorg/.cache/nvim/packer_hererocks/2.1.1697887905/share/lua/5.1/?.lua;/home/tiagorg/.cache/nvim/packer_hererocks/2.1.1697887905/share/lua/5.1/?/init.lua;/home/tiagorg/.cache/nvim/packer_hererocks/2.1.1697887905/lib/luarocks/rocks-5.1/?.lua;/home/tiagorg/.cache/nvim/packer_hererocks/2.1.1697887905/lib/luarocks/rocks-5.1/?/init.lua"
+local install_cpath_pattern = "/home/tiagorg/.cache/nvim/packer_hererocks/2.1.1697887905/lib/lua/5.1/?.so"
 if not string.find(package.path, package_path_str, 1, true) then
   package.path = package.path .. ';' .. package_path_str
 end
@@ -180,6 +180,12 @@ _G.packer_plugins = {
     path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/rose-pine",
     url = "https://github.com/rose-pine/neovim"
   },
+  ["tabset.nvim"] = {
+    config = { "\27LJ\2\n4\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\vtabset\frequire\0" },
+    loaded = true,
+    path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/tabset.nvim",
+    url = "https://github.com/FotiadisM/tabset.nvim"
+  },
   ["telescope.nvim"] = {
     loaded = true,
     path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/telescope.nvim",
@@ -209,14 +215,18 @@ _G.packer_plugins = {
 }
 
 time([[Defining packer_plugins]], false)
--- Config for: rose-pine
-time([[Config for rose-pine]], true)
-try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\0056\0\0\0009\0\1\0'\2\2\0B\0\2\1K\0\1\0\26colorscheme rose-pine\bcmd\bvim\0", "config", "rose-pine")
-time([[Config for rose-pine]], false)
 -- Config for: wrapping.nvim
 time([[Config for wrapping.nvim]], true)
 try_loadstring("\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rwrapping\frequire\0", "config", "wrapping.nvim")
 time([[Config for wrapping.nvim]], false)
+-- Config for: tabset.nvim
+time([[Config for tabset.nvim]], true)
+try_loadstring("\27LJ\2\n4\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\vtabset\frequire\0", "config", "tabset.nvim")
+time([[Config for tabset.nvim]], false)
+-- Config for: rose-pine
+time([[Config for rose-pine]], true)
+try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\0056\0\0\0009\0\1\0'\2\2\0B\0\2\1K\0\1\0\26colorscheme rose-pine\bcmd\bvim\0", "config", "rose-pine")
+time([[Config for rose-pine]], false)
 
 _G._packer.inside_compile = false
 if _G._packer.needs_bufread == true then
diff --git a/.local/bin/run b/.local/bin/run
deleted file mode 100755
index 8e08e6b..0000000
--- a/.local/bin/run
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-script=""
-args=""
-run_as_sudo="false"
-while getopts "s:r:a:l" opt; do
-    case $opt in
-        s) run_as_sudo="true" ;;
-        r) script="$OPTARG" ;;
-        a) args="$OPTARG" ;;
-        l)
-            printf "Available scripts:\n%s" "$(/bin/ls "$HOME/.dotfiles/scripts/")" 
-            exit
-        ;;
-        \?)
-            printf "Get good"
-            exit
-        ;;
-    esac
-done
-
-if [ "$run_as_sudo" = "true" ]; then
-    sudo bash "$HOME/.dotfiles/scripts/$script" "$args"
-else
-    bash "$HOME/.dotfiles/scripts/$script" "$args"
-fi
diff --git a/.zsh/.zshrc b/.zsh/.zshrc
index 345b8bd..0bce025 100644
--- a/.zsh/.zshrc
+++ b/.zsh/.zshrc
@@ -1,6 +1,9 @@
 # ~/.zshrc file for zsh interactive shells.
 # see /usr/share/doc/zsh/examples/zshrc for examples
 
+echo ""
+pfetch
+
 setopt autocd              # change directory just by typing its name
 setopt correct             # auto correct mistakes
 setopt interactivecomments # allow comments in interactive mode
@@ -51,7 +54,7 @@ zstyle ':completion:*' verbose true
 zstyle ':completion:*:kill:*' command 'ps -u $USER -o pid,%cpu,tty,cputime,cmd'
 
 # History configurations
-HISTFILE=/home/tiagorg/.dotfiles/zsh/.zsh_history
+HISTFILE=/home/tiagorg/.zsh/.zsh_history
 HISTSIZE=500000
 SAVEHIST=500000
 setopt hist_expire_dups_first # delete duplicates first when HISTFILE size exceeds HISTSIZE
@@ -114,6 +117,7 @@ configure_prompt() {
             RPROMPT=
             ;;
     esac
+    echo -e -n "\x1b[\x35 q"
     unset prompt_symbol
 }
 
@@ -209,7 +213,7 @@ precmd() {
     # Print a new line before the prompt, but only if it is not the first line
     if [ "$NEWLINE_BEFORE_PROMPT" = yes ]; then
         if [ -z "$_NEW_LINE_BEFORE_PROMPT" ]; then
-            _NEW_LINE_BEFORE_PROMPT=1
+            _NEW_LINE_BEFORE_PROMPT=0
         else
             print ""
         fi
@@ -278,6 +282,8 @@ alias autoremove='sudo pacman -Qqd | sudo pacman -Rsu - && flatpak uninstall --u
 alias c='clear'
 alias r='cd && reset'
 alias repos='cd /home/tiagorg/repos/'
+alias sus='su'
+alias s='sudo'
 
 # uaveiro-leci repository
 alias ua='cd /home/tiagorg/repos/uaveiro-leci'
diff --git a/setup b/setup
index 4af5194..cf6615d 100755
--- a/setup
+++ b/setup
@@ -28,7 +28,10 @@ setup_zsh() {
 
     cp -r .zsh ~/
     echo "ZDOTDIR=$HOME/.zsh" >> ~/.zshenv
-
+    
+    sudo chsh tiagorg --shell=/bin/zsh
+    sudo chsh root --shell=/bin/zsh
+    
     echo -e "\033[0;32mzsh setup complete!\033[0m"
 }