diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml
index f461fc2..f3b966c 100644
--- a/.config/alacritty/alacritty.toml
+++ b/.config/alacritty/alacritty.toml
@@ -1,6 +1,3 @@
-import = [
-    "~/.config/alacritty/themes/kanagawa_wave.toml"
-]
 
 [env]
 TERM = "xterm-256color"
@@ -28,3 +25,8 @@ style = "Regular"
 action = "SpawnNewInstance"
 key = "Return"
 mods = "Control|Shift"
+
+[general]
+import = [
+    "~/.config/alacritty/themes/kanagawa_wave.toml"
+]
diff --git a/.config/nvim/lua/plugins/alpha.lua b/.config/nvim/lua/plugins/alpha.lua
index 14cb1df..340ac1e 100644
--- a/.config/nvim/lua/plugins/alpha.lua
+++ b/.config/nvim/lua/plugins/alpha.lua
@@ -2,6 +2,7 @@ return {
     'goolord/alpha-nvim',
     dependencies = {
         'echasnovski/mini.icons',
+        'MaximilianLloyd/ascii.nvim',
     },
     config = function ()
         local alpha = require("alpha")
@@ -18,7 +19,7 @@ return {
         }
 
         -- Set the ASCII art
-        dashboard.section.header.val = neovim_lean
+        dashboard.section.header.val = require('ascii').get_random('text', 'slogons')
 
         -- Remove other sections (buttons, footer, etc.) to show only the ASCII art
         dashboard.section.buttons.val = {}
diff --git a/.config/nvim/lua/plugins/avante.lua b/.config/nvim/lua/plugins/avante.lua
index c475407..27ff7cb 100644
--- a/.config/nvim/lua/plugins/avante.lua
+++ b/.config/nvim/lua/plugins/avante.lua
@@ -2,7 +2,21 @@ return {
     "yetone/avante.nvim",
     event = "VeryLazy",
     version = false,
+    enabled = false,
+    keys = {
+        "<leader>A",
+        "<cmd>AvanteToggle<cr>"
+    },
     opts = {
+        behaviour = {
+            auto_suggestions = false, -- Experimental stage
+            auto_set_highlight_group = true,
+            auto_set_keymaps = false,
+            auto_apply_diff_after_generation = false,
+            support_paste_from_clipboard = false,
+            minimize_diff = true,         -- Whether to remove unchanged lines when applying a code block
+            enable_token_counting = true, -- Whether to enable token counting. Default to true.
+        },
     },
     build = "make",
     dependencies = {
diff --git a/.config/nvim/lua/plugins/blink.lua b/.config/nvim/lua/plugins/blink.lua
index b6fd5e0..3c18bfc 100644
--- a/.config/nvim/lua/plugins/blink.lua
+++ b/.config/nvim/lua/plugins/blink.lua
@@ -4,6 +4,7 @@ return {
     dependencies = {
         'rafamadriz/friendly-snippets',
         'mikavilpas/blink-ripgrep.nvim',
+        { 'kristijanhusak/vim-dadbod-completion', ft = { 'sql', 'mysql', 'plsql' }, lazy = true },
     },
 
     version = '1.*',
@@ -38,8 +39,12 @@ return {
                 'path',
                 'snippets',
                 'buffer',
+                'dadbod',
             },
 
+            providers = {
+                dadbod = { name = "Dadbod", module = "vim_dadbod_completion.blink" },
+            },
         },
 
         signature = {
diff --git a/.config/nvim/lua/plugins/colorscheme.lua b/.config/nvim/lua/plugins/colorscheme.lua
index ff01b0e..cc8dffc 100644
--- a/.config/nvim/lua/plugins/colorscheme.lua
+++ b/.config/nvim/lua/plugins/colorscheme.lua
@@ -29,6 +29,6 @@ return {
 		})
 
 		-- setup must be called before loading
-		vim.cmd("colorscheme kanagawa")
+        require("kanagawa").load("wave")
 	end,
 }
diff --git a/.config/nvim/lua/plugins/commentless.lua b/.config/nvim/lua/plugins/commentless.lua
new file mode 100644
index 0000000..cbd011a
--- /dev/null
+++ b/.config/nvim/lua/plugins/commentless.lua
@@ -0,0 +1,19 @@
+return {
+    "soemre/commentless.nvim",
+    cmd = "Commentless",
+    keys = {
+        {
+            "<leader>/",
+            function()
+                require("commentless").toggle()
+            end,
+            desc = "Toggle Comments",
+        },
+    },
+    dependencies = {
+        "nvim-treesitter/nvim-treesitter",
+    },
+    opts = {
+        -- Customize Configuration
+    },
+}
diff --git a/.config/nvim/lua/plugins/dadbod.lua b/.config/nvim/lua/plugins/dadbod.lua
new file mode 100644
index 0000000..0166757
--- /dev/null
+++ b/.config/nvim/lua/plugins/dadbod.lua
@@ -0,0 +1,22 @@
+return {
+    'kristijanhusak/vim-dadbod-ui',
+    dependencies = {
+        { 'tpope/vim-dadbod',                     lazy = true },
+        { 'kristijanhusak/vim-dadbod-completion', ft = { 'sql', 'mysql', 'plsql' }, lazy = true }, -- Optional
+    },
+    cmd = {
+        'DBUI',
+        'DBUIToggle',
+        'DBUIAddConnection',
+        'DBUIFindBuffer',
+    },
+    init = function()
+        -- Your DBUI configuration
+        vim.g.db_ui_use_nerd_fonts = 1
+        vim.g.db_ui_auto_execute_table_helpers = 1
+
+        vim.g.dbs = {
+            dev = 'mariadb://jack:secret@localhost:33061/jack?ssl=false',
+        }
+    end,
+}
diff --git a/.config/nvim/lua/plugins/flutter-tools.lua b/.config/nvim/lua/plugins/flutter-tools.lua
index f2347eb..8790556 100644
--- a/.config/nvim/lua/plugins/flutter-tools.lua
+++ b/.config/nvim/lua/plugins/flutter-tools.lua
@@ -3,6 +3,5 @@ return {
     lazy = false,
     dependencies = {
         'nvim-lua/plenary.nvim',
-        'stevearc/dressing.nvim',
     },
 }
diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile
index ce193ac..4ef88b3 100644
--- a/.config/zsh/.zprofile
+++ b/.config/zsh/.zprofile
@@ -1,3 +1,3 @@
-if [ -z "$DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
+if [[ -z "$DISPLAY" ]] && [[ "$XDG_VTNR" = 1 ]] && [[ $(tty) = /dev/tty1 ]]; then
     exec startx
 fi
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 79b2f77..15e7300 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -3,6 +3,8 @@
 # Speed debugging
 # zmodload zsh/zprof
 
+stty -ixon
+
 if [[ "$(locale LC_CTYPE)" == "UTF-8" ]]; then
     setopt COMBINING_CHARS
 fi
@@ -128,5 +130,7 @@ export PATH=~/.config/composer/vendor/bin:$PATH
 
 export PATH="/opt/flutter/bin:$PATH"
 
+export PATH="$PATH":"$HOME/.pub-cache/bin"
+
 # Speed debugging
 # zprof
diff --git a/.luarc.json b/.luarc.json
new file mode 100644
index 0000000..1e1765c
--- /dev/null
+++ b/.luarc.json
@@ -0,0 +1,5 @@
+{
+    "diagnostics.globals": [
+        "vim"
+    ]
+}
\ No newline at end of file
diff --git a/.tmux.conf b/.tmux.conf
index 04de61a..7f4ee92 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -70,29 +70,6 @@ bind S command-prompt -p "New Session:" "new-session -A -s '%%'"
 
 bind-key -r f run-shell "tmux neww ~/.local/bin/tmux-sessionizer"
 
-# Flow colorscheme | Tmux
-# https://github.com/0xstepit/flow.nvim
-## Statusbar style
-# set -g status-position top
-# set -g status-right-length "100"
-# set -g status-left-length "100"
-# set -g status-style bg=#141A1F,fg=#3D4F5C
-# set -g window-status-style fg=#3D4F5C,bg=#141A1F
-# setw -g window-status-separator " "
-# set -g window-status-current-style fg=colour198
-# set -g window-status-format "(#I) #W"
-# set -g window-status-current-format "(#I) #W"
-# set -g status-left "#[fg=#0D0D0D,bg=#75BDF0] #S #[bg=#3D4F5C,fg=#75BDF0] #h #[bg=#141A1F] "
-# set -g status-right "#[bg=#3D4F5C,fg=#75BDF0] %H:%M #[fg=#0D0D0D,bg=#75BDF0] %A %d. %b %Y "
-#
-# set -g message-command-style fg=#FF007C
-# set -g message-style "fg=#FF007C, bg=#141A1F" # color used in the message popup.
-#
-# set -g mode-style "fg=#FF007C"
-# ## Borders
-# set -g pane-border-style "fg=#3D4F5C"
-# set -g pane-active-border-style "fg=#3D4F5C"
-
 # List of plugins
 set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-sensible'
@@ -103,17 +80,7 @@ set -g @plugin 'tmux-plugins/tmux-sensible'
 set -g @plugin 'Nybkox/tmux-kanagawa'
 set -g @kanagawa-show-powerline true
 set -g @kanagawa-theme 'wave'
-
-# set -g @plugin 'jibingeo/tmux-colors-ayu'
-
-# set -g @plugin 'egel/tmux-gruvbox'
-# set -g @tmux-gruvbox 'dark' # or 'light'
-
-# set -g @plugin 'catppuccin/tmux'
-# set -g @catppuccin_flavour 'mocha'
-# set -g @catppuccin_status_left_separator ""
-# set -g @catppuccin_window_middle_separator " "
-# set -g @catppuccin_status_modules_right "application session directory date_time"
+# set -g @kanagawa-ignore-window-colors true
 
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
 run '~/.tmux/plugins/tpm/tpm'