diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 2b5fea0..32541c8 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -11,10 +11,9 @@
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "conform.nvim": { "branch": "master", "commit": "1a99fdc1d3aa9ccdf3021e67982a679a8c5c740c" },
   "dressing.nvim": { "branch": "master", "commit": "1b7921eecc65af1baf8ac1dc06f0794934cbcfb2" },
-  "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" },
   "friendly-snippets": { "branch": "main", "commit": "00ba9dd3df89509f95437b8d595553707c46d5ea" },
-  "fzf-lua": { "branch": "main", "commit": "a1f834b37506ca77c47fa99cd3f5e9ed3f4102d2" },
-  "gruvbox-material": { "branch": "master", "commit": "b16dcd787db5ba9302b54ebeac186784c2aed29a" },
+  "fzf-lua": { "branch": "main", "commit": "fb00a0dec19ad03140f26b56fa76973c921147dc" },
+  "gruvbox-material": { "branch": "master", "commit": "25425c4feea270951c33de67c595ab3bbe8b0e7e" },
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
   "inc-rename.nvim": { "branch": "main", "commit": "8ba77017ca468f3029bf88ef409c2d20476ea66b" },
   "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" },
@@ -25,25 +24,26 @@
   "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "mini.ai": { "branch": "main", "commit": "9b9b7cfa38b4871c3e44cfe89cf6d53fd40684d9" },
-  "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },
+  "mini.notify": { "branch": "main", "commit": "1c901d62581439f3d17382a5bf7001a282d6468b" },
+  "nvim-autopairs": { "branch": "master", "commit": "f158dcb865c36f72c92358f87787dab2c272eaf3" },
   "nvim-bqf": { "branch": "main", "commit": "1b24dc6050c34e8cd377b6b4cd6abe40509e0187" },
   "nvim-cmp": { "branch": "perf", "commit": "6c3d595f3223c1ae7392d4fde1626355439af6c1" },
-  "nvim-lspconfig": { "branch": "master", "commit": "aa615f62300465eef5115e0b7dfcf6dedc274f5d" },
+  "nvim-lspconfig": { "branch": "master", "commit": "a9bc587e9ae0cbcb3e90a2e9342f86b3b78c4408" },
   "nvim-tmux-navigation": { "branch": "main", "commit": "4898c98702954439233fdaf764c39636681e2861" },
-  "nvim-treesitter": { "branch": "master", "commit": "ef52e44bb24161e5138b3de5beadab3f3fcff233" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "17d9c1a6c378f5dc040f4e2e7dc4600434c51d1e" },
+  "nvim-treesitter": { "branch": "master", "commit": "84836f08ef840756990cab874f9f5e18d4f173f5" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "3d5390c49e3f8fe457b376df2a49aa39d75b7911" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "4a2d05ec24eaa6b655c7d19092a3b6c0219d46b9" },
-  "nvim-web-devicons": { "branch": "master", "commit": "6b53401918a9033a41159d012160c5fb5eb249ae" },
-  "oil.nvim": { "branch": "master", "commit": "9e6fb844fe4cce13d9e3f6a7c970cbc669bb1629" },
+  "nvim-web-devicons": { "branch": "master", "commit": "26220156aafb198b2de6a4cf80c1b120a3768da0" },
+  "oil.nvim": { "branch": "master", "commit": "1360be5fda9c67338331abfcd80de2afbb395bcd" },
   "pastify.nvim": { "branch": "main", "commit": "5e0e7e5e1b4880476a35a82d3dfe93764a9a37da" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
-  "rustaceanvim": { "branch": "master", "commit": "29f42cc149f915d771c550b6dfe7c788d856cf04" },
+  "rustaceanvim": { "branch": "master", "commit": "ebbd10006d2deeb71c46d58c4c69aa3d5c088310" },
   "screenkey.nvim": { "branch": "main", "commit": "0589de3c857721e150ea694cfe66d6d0e8aecacb" },
   "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
   "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
   "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
   "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
   "vim-tpipeline": { "branch": "master", "commit": "72a624f97730059bab359cb0b58a23433bfec308" },
-  "vimtex": { "branch": "master", "commit": "be2c13c76eb4c72b2d036900aa17b4b8200ddfb5" },
+  "vimtex": { "branch": "master", "commit": "b9cc11536a4e726c58c4776e9bcecff26fc454cb" },
   "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }
 }
diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua
index 521eddf..d9e7423 100644
--- a/.config/nvim/lua/plugins/lsp.lua
+++ b/.config/nvim/lua/plugins/lsp.lua
@@ -219,8 +219,8 @@ return {
     },
     {
         'mrcjkb/rustaceanvim',
-        version = '^5',
-        lazy = false
+        version = '^5', -- Recommended
+        lazy = false,   -- This plugin is already lazy
     },
     {
         "stevearc/conform.nvim",
diff --git a/.config/nvim/lua/plugins/mini.lua b/.config/nvim/lua/plugins/mini.lua
new file mode 100644
index 0000000..3f39ac0
--- /dev/null
+++ b/.config/nvim/lua/plugins/mini.lua
@@ -0,0 +1,25 @@
+return {
+    {
+        'echasnovski/mini.ai',
+        version = false,
+        opts = {}
+    },
+
+    {
+        'echasnovski/mini.notify',
+        version = false,
+        config = function()
+            vim.api.nvim_set_hl(0, 'MiniNotifyNormal', { link = 'Normal' })
+            vim.api.nvim_set_hl(0, 'MiniNotifyBorder', { link = 'Normal' })
+            require("mini.notify").setup({
+                -- Window options
+                window = {
+                    -- Floating window config
+                    config = {},
+                    -- Value of 'winblend' option
+                },
+
+            })
+        end
+    },
+}
diff --git a/.config/nvim/lua/plugins/navigation.lua b/.config/nvim/lua/plugins/navigation.lua
index 3952476..8c67595 100644
--- a/.config/nvim/lua/plugins/navigation.lua
+++ b/.config/nvim/lua/plugins/navigation.lua
@@ -21,19 +21,16 @@ return {
         opts = {},
     },
     {
-        'mrjones2014/smart-splits.nvim',
-        config = function()
-            require('smart-splits').setup({})
-            --Resize
-            vim.keymap.set('n', '<S-F5>', require('smart-splits').resize_left)
-            vim.keymap.set('n', '<S-F6>', require('smart-splits').resize_down)
-            vim.keymap.set('n', '<S-F7>', require('smart-splits').resize_up)
-            vim.keymap.set('n', '<S-F8>', require('smart-splits').resize_right)
-            --Move
-            vim.keymap.set('n', '<F5>', require('smart-splits').move_cursor_left)
-            vim.keymap.set('n', '<F6>', require('smart-splits').move_cursor_down)
-            vim.keymap.set('n', '<F7>', require('smart-splits').move_cursor_up)
-            vim.keymap.set('n', '<F8>', require('smart-splits').move_cursor_right)
-        end
+        "alexghergh/nvim-tmux-navigation",
+        event = "VeryLazy",
+        opts = {
+            disable_when_zoomed = true, -- defaults to false
+            keybindings = {
+                left = "<F5>",
+                down = "<F6>",
+                up = "<F7>",
+                right = "<F8>",
+            },
+        },
     },
 }
diff --git a/.config/nvim/lua/plugins/ui.lua b/.config/nvim/lua/plugins/ui.lua
index 004de39..d1fd16f 100644
--- a/.config/nvim/lua/plugins/ui.lua
+++ b/.config/nvim/lua/plugins/ui.lua
@@ -8,22 +8,21 @@ return {
             vim.g.tpipeline_statusline = '%=%l:%c'
         end
     },
+    {
+        'echasnovski/mini.notify',
+        version = false,
+        config = function()
+            vim.api.nvim_set_hl(0, 'MiniNotifyNormal', { link = 'Normal' })
+            vim.api.nvim_set_hl(0, 'MiniNotifyBorder', { link = 'Normal' })
+            require("mini.notify").setup()
+        end
+    },
     --Better quick fix
     {
         'kevinhwang91/nvim-bqf',
         event = "VeryLazy",
         ft = 'qf'
     },
-    {
-        "j-hui/fidget.nvim",
-        opts = {
-            progress = {
-                display = {
-                    render_limit = 3,
-                }
-            }
-        },
-    },
     {
         "OXY2DEV/markview.nvim",
         ft = "markdown",
diff --git a/.config/tmux/themes/catppuccin-latte.tmuxtheme b/.config/tmux/themes/catppuccin-latte.tmuxtheme
index f03bd2e..ea4623c 100644
--- a/.config/tmux/themes/catppuccin-latte.tmuxtheme
+++ b/.config/tmux/themes/catppuccin-latte.tmuxtheme
@@ -1,14 +1,14 @@
-#--> Catppuccin (Latte)
-bg="dce0e8"
-fg="4c4f69"
-cyan="179299"
-black="e6e9ef"
-gray="bcc0cc"
-magenta="ea76cb"
-pink="8839ef"
-red="d20f39"
-green="40a02b"
-yellow="df8e1d"
-blue="1e66f5"
-orange="fe640b"
-black4="acb0be"
+# --> Catppuccin (Latte)
+"bg=#dce0e8     ,
+fg=#4c4f69     ,
+cyan=#179299   ,
+black=#e6e9ef  ,
+gray=#bcc0cc   ,
+magenta=#ea76cb,
+pink=#8839ef   ,
+red=#d20f39    ,
+green=#40a02b  ,
+yellow=#df8e1d ,
+blue=#1e66f5   ,
+orange=#fe640b ,
+black4=#acb0be ,"
diff --git a/.config/xmonad/xmonad-contrib-git b/.config/xmonad/xmonad-contrib-git
index 2c161ff..42340e0 160000
--- a/.config/xmonad/xmonad-contrib-git
+++ b/.config/xmonad/xmonad-contrib-git
@@ -1 +1 @@
-Subproject commit 2c161ff670593d147823a08d73730080ef952753
+Subproject commit 42340e0f76a7a934f2a4a8d0da3165f74f68e6be
diff --git a/.config/xmonad/xmonad-git b/.config/xmonad/xmonad-git
index aadb8df..a4140b9 160000
--- a/.config/xmonad/xmonad-git
+++ b/.config/xmonad/xmonad-git
@@ -1 +1 @@
-Subproject commit aadb8df59bca896b198420757aff570e53bd9c9c
+Subproject commit a4140b93497333ec7f3127ee4dabcb8ae8a721b6
diff --git a/.config/xmonad/xmonad.hs b/.config/xmonad/xmonad.hs
index 77f5889..46724a3 100644
--- a/.config/xmonad/xmonad.hs
+++ b/.config/xmonad/xmonad.hs
@@ -120,7 +120,9 @@ myManageHook = composeAll
   , resource  =? "kdesktop"       --> doIgnore
   , title     =? "Picture-in-Picture" --> doFloat
   , className =? "firefox"        --> doShift (myWorkspaces !! 1)
-  , className =? "discord"        --> doShift (myWorkspaces !! 2)
+  , className =? "Code"        --> doShift (myWorkspaces !! 3)
+  , className =? "discord"        --> doShift (myWorkspaces !! 4)
+  , title     =? "JetBrains Toolbox" --> doShift (myWorkspaces !! 3)
   , className =? "main" --> doFloat
   , className =? "thunderbird"  --> doShift (myWorkspaces !! 5)
   , className =? "Xmessage" --> doFloat
diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv
index cf54b27..661f7d7 100644
--- a/.config/zsh/.zshenv
+++ b/.config/zsh/.zshenv
@@ -1,11 +1,10 @@
 #This is used to reload the instance
-if [[ ! $(tty) =~ ^/dev/tty[0-9]*$ ]]; then
-    TRAPUSR1() {
-        if [[ -o INTERACTIVE ]]; then
-            exec "${SHELL}"
-        fi
+TRAPUSR1() {
+    if [[ -o INTERACTIVE ]]; then
+        exec "${SHELL}"
+    fi
 }
-fi
+
 
 # Add exports
 if [[ $(uname) == "Darwin" ]]; then
diff --git a/.config/zsh/functions.zsh b/.config/zsh/functions.zsh
index 2374f31..6d659d7 100644
--- a/.config/zsh/functions.zsh
+++ b/.config/zsh/functions.zsh
@@ -1,12 +1,12 @@
 function vim {
     if [[ -z "$@" ]]; then
         if [[ -f "./.session.vim" ]]; then
-            nvim -S .session.vim -c 'lua vim.g.savesession = true'
+            nvim -S .session.vim --listen /tmp/nvim.pipe -c 'lua vim.g.savesession = true'
         else
-            nvim -c 'lua vim.g.savesession = true'
+            nvim --listen /tmp/nvim.pipe -c 'lua vim.g.savesession = true'
         fi
     else
-        nvim "$@"
+        nvim --listen /tmp/nvim.pipe "$@"
     fi
 }
 
diff --git a/.gitconfig b/.gitconfig
index 3b3923a..98c2a1c 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -29,7 +29,7 @@
 [tag]
     gpgsign = true
 [pull]
-    rebase = true
+    rebase = false
 [init]
     defaultBranch = main
 [alias]
diff --git a/.local/bin/change-theme.sh b/.local/bin/change-theme.sh
index 45c1ca2..772099c 100755
--- a/.local/bin/change-theme.sh
+++ b/.local/bin/change-theme.sh
@@ -39,9 +39,7 @@ change_common(){
     tmux source-file ~/.config/tmux/tmux.conf
 
     echo "vim.cmd('colorscheme ${nvim_color_scheme}')" >> ~/.config/nvim/lua/core/theme.lua
-    for addr in $XDG_RUNTIME_DIR/nvim.*; do
-        nvim --server $addr --remote-send ':colorscheme ${nvim_color_scheme}<CR>' || true
-    done
+    nvim --server /tmp/nvim.pipe --remote-send ":colorscheme ${nvim_color_scheme}<CR>" || true
 }
 
 case $1 in