diff --git a/roles/customize/tasks/Debian-12.yml b/roles/customize/tasks/Debian-12.yml
new file mode 100644
index 0000000..2d2c4ef
--- /dev/null
+++ b/roles/customize/tasks/Debian-12.yml
@@ -0,0 +1,5 @@
+- name: "Install tpm"
+  include_tasks: "../scripts/install_tpm.yml"
+
+- name: "Install OhMyZSH"
+  include_tasks: "../scripts/install_ohmyzsh.yml"
diff --git a/roles/customize/tasks/defaults.yml b/roles/customize/tasks/defaults.yml
index 7133078..fa358f9 100644
--- a/roles/customize/tasks/defaults.yml
+++ b/roles/customize/tasks/defaults.yml
@@ -1,14 +1,3 @@
-- name: check if nvchad is installed
-  become_user: user
-  stat: 
-    path: ~/.config/nvim 
-  register: nvchad
-
-- name: Download NVChad
-  become_user: user
-  shell: git clone https://github.com/NvChad/NvChad ~/.config/nvim --depth 1 
-  when: nvchad.stat.exists == false
-
 - name: check if tpm is installed
   become_user: user
   stat: 
diff --git a/roles/packages/tasks/Pop!_OS-22.04.yml b/roles/packages/tasks/Pop!_OS-22.04.yml
index c23a333..4c01bd4 100644
--- a/roles/packages/tasks/Pop!_OS-22.04.yml
+++ b/roles/packages/tasks/Pop!_OS-22.04.yml
@@ -7,8 +7,8 @@
 - name: "Install fonts"
   include_tasks: "../scripts/install_fonts.yml"
 
-- name: Enable wayland 
-  shell: sed -i 's/WaylandEnable=false/WaylandEnable=true/' /etc/gdm3/custom.conf
+#- name: Enable wayland 
+#  shell: sed -i 's/WaylandEnable=false/WaylandEnable=true/' /etc/gdm3/custom.conf
 
 - name: Start and enable services
   ansible.builtin.systemd:
diff --git a/roles/packages/vars/Debian-12.yml b/roles/packages/vars/Debian-12.yml
index 8aecb2f..f18d2c5 100644
--- a/roles/packages/vars/Debian-12.yml
+++ b/roles/packages/vars/Debian-12.yml
@@ -2,6 +2,7 @@ required_packages:
   - ripgrep
   - ansible
   - libfuse2
+  - fuse
   - git
   - zsh
   - nfs-common
@@ -13,11 +14,10 @@ required_packages:
   - libvirt-daemon     
   - stow
   - tmux
-  - xsel
   - easy-rsa 
   - docker.io
   - httpie
-  - wl-clipboard
+  
 
 apt_keys:
   - https://packages.cloud.google.com/apt/doc/apt-key.gpg
diff --git a/roles/packages/vars/Pop!_OS-22.04.yml b/roles/packages/vars/Pop!_OS-22.04.yml
index e5734c3..bbb0c45 100644
--- a/roles/packages/vars/Pop!_OS-22.04.yml
+++ b/roles/packages/vars/Pop!_OS-22.04.yml
@@ -17,12 +17,11 @@ required_packages:
   - tmux
   - terminator
   - system76-keyboard-configurator
-  - xsel
+  - xclip
   - openvpn 
   - easy-rsa 
   - docker.io
   - httpie
-  - wl-clipboard
 
 apt_keys:
   - https://packages.cloud.google.com/apt/doc/apt-key.gpg
diff --git a/scripts/install_nvim.yml b/scripts/install_nvim.yml
index 0f0983b..1f3e62c 100644
--- a/scripts/install_nvim.yml
+++ b/scripts/install_nvim.yml
@@ -4,3 +4,14 @@
     dest: /usr/bin/nvim
     mode: '0755'
     checksum: sha256:https://github.com/neovim/neovim/releases/download/{{ nvim_version }}/nvim.appimage.sha256sum
+
+- name: check if nvchad is installed
+  become_user: user
+  stat: 
+    path: ~/.config/nvim 
+  register: nvchad
+
+- name: Download NVChad
+  become_user: user
+  shell: git clone https://github.com/NvChad/NvChad ~/.config/nvim --depth 1 
+  when: nvchad.stat.exists == false
diff --git a/scripts/install_ohmyzsh.yml b/scripts/install_ohmyzsh.yml
new file mode 100644
index 0000000..21aada0
--- /dev/null
+++ b/scripts/install_ohmyzsh.yml
@@ -0,0 +1,38 @@
+- name: Check that Oh My ZSH is installed
+  become_user: user 
+  stat:
+    path: "~/.oh-my-zsh"
+  register: ohmyzsh_result
+
+- name: Install Oh My ZSH
+  become_user: user
+  shell: sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
+  args:
+    creates: "~/.oh-my-zsh"
+  when: not ohmyzsh_result.stat.exists
+
+- name: Check that Auto Suggestions is installed
+  become_user: user
+  stat:
+    path: ~/.oh-my-zsh/custom/plugins/zsh-autosuggestions
+  register: auto_suggestions_result
+
+- name: Install Auto Suggestions
+  become_user: user
+  shell: git clone https://github.com/zsh-users/zsh-autosuggestions ~/.oh-my-zsh/custom/plugins/zsh-autosuggestions
+  when: not auto_suggestions_result.stat.exists
+
+- name: check if zshrc file was moved
+  become_user: user
+  stat: 
+    path: ~/.zshrc.pre-oh-my-zsh 
+  register: zshrc
+
+- name: Restore zshrc file
+  become_user: user
+  shell: rm ~/.zshrc && mv ~/.zshrc.pre-oh-my-zsh ~/.zshrc
+  when: zshrc.stat.exists == true
+
+- user:
+    name: "user"
+    shell: /usr/bin/zsh
diff --git a/scripts/install_tpm.yml b/scripts/install_tpm.yml
new file mode 100644
index 0000000..550a978
--- /dev/null
+++ b/scripts/install_tpm.yml
@@ -0,0 +1,10 @@
+- name: check if tpm is installed
+  become_user: user
+  stat: 
+    path: ~/.tmux/plugins/tpm 
+  register: tpm
+
+- name: Download TPM
+  become_user: user
+  shell: git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
+  when: tpm.stat.exists == false