diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index c38837c..b571cee 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -374,7 +374,7 @@ require('lazy').setup({
                         -- Lsp server name .
                         function()
                             local msg = ''
-                            local clients = vim.lsp.get_active_clients({ bufnr = 0 })
+                            local clients = vim.lsp.get_clients({ bufnr = 0 })
                             if next(clients) == nil then
                                 return msg
                             end
diff --git a/tmux.conf b/tmux.conf
index b4ba2f5..b5d753a 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,6 +1,6 @@
 # Plugind
 set -g @plugin 'tmux-plugins/tpm'
-set -g @plugin 'thewtex/tmux-mem-cpu-load'
+# set -g @plugin 'thewtex/tmux-mem-cpu-load'
 set -g @plugin 'tmux-plugins/tmux-yank'
 
 # Install `tpm` if needed.
@@ -46,7 +46,8 @@ set -g status-interval 2
 set -g status-bg "#0c0c0c" 
 set -g status-fg "#6c6c6c" 
 set -g status-left ''
-set -g status-right '#($TMUX_PLUGIN_MANAGER_PATH/tmux-mem-cpu-load/tmux-mem-cpu-load -g 0 --interval 2)  |  %H:%M  |  %d-%b-%Y'
+set -g status-right '| %H:%M | %d-%b-%Y '
+# set -g status-right '#($TMUX_PLUGIN_MANAGER_PATH/tmux-mem-cpu-load/tmux-mem-cpu-load -g 0 --interval 2)  |  %H:%M  |  %d-%b-%Y'
 set -g status-right-length 100 
 
 # Use normal and bright monochrome colors to show a tab line on the left.
diff --git a/update.sh b/update.sh
index 33f884d..b1edf15 100755
--- a/update.sh
+++ b/update.sh
@@ -24,13 +24,21 @@ fi
 
 # Ubuntu 20.04 workaround
 printf -- '\033[33m Remove neovim if already installed\n\033[37m'
-sudo apt -y purge --auto-remove neovim
+if [ "$(dpkg -l | awk '/nala/ {print }'|wc -l)" -ge 1 ]; then
+    sudo nala purge -y --autoremove neovim
+else
+    sudo apt -y purge --auto-remove neovim
+fi
 
 # Install system packages
 printf -- '\033[33m Installing system packages\n\033[37m'
-sudo apt update
-sudo apt install -y nala
-sudo nala update 
+if [ "$(dpkg -l | awk '/nala/ {print }'|wc -l)" -ge 1 ]; then
+    sudo nala update
+else
+    sudo apt update
+    sudo apt install -y nala
+    sudo nala update 
+fi
 sudo nala upgrade -y
 sudo nala install -y gpg ninja-build gettext cmake unzip curl python3 python3-pip python3-venv \
     build-essential libssl-dev libffi-dev python3-dev file tmux libudev-dev pkg-config locales pipx btop ncdu ranger 
@@ -104,11 +112,10 @@ cargo install tree-sitter-cli
 # Install ripgrep
 printf -- '\033[33m Installing ripgrep\n\033[37m'
 cargo install ripgrep
-# sudo apt install -y ripgrep
 
-# Install zellij 
-printf -- '\033[33m Installing zellij\n\033[37m'
-cargo install --locked zellij
+# Install eza 
+printf -- '\033[33m Installing eza\n\033[37m'
+cargo install eza
 
 # Install fd
 printf -- '\033[33m Installing fd\n\033[37m'
@@ -200,11 +207,11 @@ printf -- '\033[33m Installing neovim for node\n\033[37m'
 sudo npm install -g neovim
 
 if [ $DESKTOP == "yes" ]; then
-    # Install Ubuntu apps 
+    # Install flatpak 
     printf -- '\033[33m Installing desktop dep.\n\033[37m'
     sudo add-apt-repository -y ppa:flatpak/stable
     sudo nala update
-    sudo nala install -y flatpak gnome-shell-extension-manager remmina 
+    sudo nala install -y flatpak 
     flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
 
     printf -- '\033[33m Installing Visual Code\n\033[37m'
@@ -237,6 +244,15 @@ if [ $DESKTOP == "yes" ]; then
 'KERNEL==\"uinput\", SUBSYSTEM==\"misc\", OPTIONS+=\"static_node=uinput\", TAG+=\"uaccess\", GROUP=\"input\", MODE=\"0660\"' > /etc/udev/rules.d/60-streamdeck.rules"
     sudo udevadm trigger
 
+    # Install gnome-shell-extension-manager
+    printf -- '\033[33m Installing gnome-shell-extension-manager\n\033[37m'
+    sudo nala install -y gnome-shell-extension-manager 
+    
+    # Install remmina 
+    printf -- '\033[33m Installing remmina\n\033[37m'
+    sudo nala install -y remmina 
+    
+    # Install NerdFonts
     printf -- '\033[33m Installing NerdFonts\n\033[37m'
     mkdir -p /home/$USER/.local/share/fonts
     cd /home/$USER/.local/share/fonts
@@ -248,6 +264,18 @@ if [ $DESKTOP == "yes" ]; then
     rm NerdFontsSymbolsOnly.zip
     fc-cache -fv
 
+    # Install Wezterm 
+    printf -- '\033[33m Installing wezterm\n\033[37m'
+    curl -fsSL https://apt.fury.io/wez/gpg.key | sudo gpg --yes --dearmor -o /usr/share/keyrings/wezterm-fury.gpg
+    echo 'deb [signed-by=/usr/share/keyrings/wezterm-fury.gpg] https://apt.fury.io/wez/ * *' | sudo tee /etc/apt/sources.list.d/wezterm.list
+    sudo nala update
+    sudo nala install -y wezterm
+
+    # Symlink wezterm config
+    printf -- '\033[33m Symlinking wezterm config\n\033[37m'
+    ln -sf ~/code_server/wezterm.lua ~/.wezterm.lua
+
+    # Install Virtualbox 
     if [ "$(dpkg -l | awk '/virtualbox/ {print }'|wc -l)" -eq 0 ]; then
         printf -- '\033[33m Installing Virtualbox\n\033[37m'
         curl https://www.virtualbox.org/download/oracle_vbox_2016.asc | gpg --dearmor > oracle_vbox_2016.gpg
@@ -313,6 +341,7 @@ printf -- '\033[33m Adding path to bashrc\n\033[37m'
 echo 'PATH="$HOME/.local/bin:$HOME/.cargo/bin:$PATH"' >> ~/.bashrc
 echo 'alias vi="nvim"' >> ~/.bashrc
 echo 'alias vim="nvim"' >> ~/.bashrc
+echo 'alias ls="eza -1 -l --icons=auto --git-repos --git"' >> ~/.bashrc
 echo 'source ~/.fzf.bash' >> ~/.bashrc
 
 if [ $DESKTOP == "no" ]; then
@@ -326,4 +355,15 @@ if [ $DESKTOP == "no" ]; then
     echo "fi" >> ~/.bashrc
 fi
 
+if [ $DESKTOP == "yes" ]; then
+    # Add tmux/nvim autostart to bashrc
+    printf -- '\033[33m Adding tmux/nvim autostart to bashrc\n\033[37m'
+    echo "# TMUX" >> ~/.bashrc
+    echo "if [[ ! \$TERM =~ screen ]]; then" >> ~/.bashrc
+    echo "if which tmux >/dev/null 2>&1; then" >> ~/.bashrc
+    echo '   tmux new-session' >> ~/.bashrc
+    echo "fi" >> ~/.bashrc
+    echo "fi" >> ~/.bashrc
+fi
+
 printf -- '\033[32m \n\n***** Update complete! Please restart your terminal. *****\n\n\033[37m'
diff --git a/wezterm.lua b/wezterm.lua
new file mode 100644
index 0000000..44baab8
--- /dev/null
+++ b/wezterm.lua
@@ -0,0 +1,84 @@
+-- Pull in the wezterm API
+local wezterm = require 'wezterm'
+local config = {}
+
+config.enable_tab_bar = false
+
+config.colors = {
+    -- The default text color
+    foreground = '#c6c6c6',
+    -- The default background color
+    background = 'black',
+
+    -- Overrides the cell background color when the current cell is occupied by the
+    -- cursor and the cursor style is set to Block
+    cursor_bg = '#afd787',
+    -- Overrides the text color when the current cell is occupied by the cursor
+    cursor_fg = 'black',
+    -- Specifies the border color of the cursor when the cursor style is set to Block,
+    -- or the color of the vertical or horizontal bar when the cursor style is set to
+    -- Bar or Underline.
+    cursor_border = '#afd787',
+
+    -- the foreground color of selected text
+    selection_fg = 'black',
+    -- the background color of selected text
+    selection_bg = '#eeeeee',
+
+    -- The color of the scrollbar "thumb"; the portion that represents the current viewport
+    scrollbar_thumb = '#303030',
+
+    -- The color of the split lines between panes
+    split = '#303030',
+
+    ansi = {
+        '#000000',
+        '#d75400',
+        '#afd787',
+        '#d7af5f',
+        '#87afd7',
+        '#87afd7',
+        '#d7d7af',
+        '#eeeeee',
+    },
+    brights = {
+        '#444444',
+        '#d75400',
+        '#afd787',
+        '#d7af5f',
+        '#87afd7',
+        '#87afd7',
+        '#d7d7af',
+        '#eeeeee',
+    },
+
+    -- Arbitrary colors of the palette in the range from 16 to 255
+    indexed = { [136] = '#d7af5f' },
+
+    -- Since: 20220319-142410-0fcdea07
+    -- When the IME, a dead key or a leader key are being processed and are effectively
+    -- holding input pending the result of input composition, change the cursor
+    -- to this color to give a visual cue about the compose state.
+    compose_cursor = '#d7af5f',
+
+    -- Colors for copy_mode and quick_select
+    -- available since: 20220807-113146-c2fee766
+    -- In copy_mode, the color of the active text is:
+    -- 1. copy_mode_active_highlight_* if additional text was selected using the mouse
+    -- 2. selection_* otherwise
+    copy_mode_active_highlight_bg = { Color = '#000000' },
+    -- use `AnsiColor` to specify one of the ansi color palette values
+    -- (index 0-15) using one of the names "Black", "Maroon", "Green",
+    --  "Olive", "Navy", "Purple", "Teal", "Silver", "Grey", "Red", "Lime",
+    -- "Yellow", "Blue", "Fuchsia", "Aqua" or "White".
+    copy_mode_active_highlight_fg = { Color = '#000000' },
+    copy_mode_inactive_highlight_bg = { Color = '#afd787' },
+    copy_mode_inactive_highlight_fg = { Color = '#eeeeee' },
+
+    quick_select_label_bg = { Color = '#444444' },
+    quick_select_label_fg = { Color = '#eeeeee' },
+    quick_select_match_bg = { Color = '#87afd7' },
+    quick_select_match_fg = { Color = '#eeeeee' },
+}
+-- and finally, return the configuration to wezterm
+return config