diff --git a/playbook/group_vars/all b/playbook/group_vars/all
deleted file mode 100644
index e69de29..0000000
diff --git a/playbook/roles/role-one/files/settings.json b/playbook/roles/role-one/files/settings.json
new file mode 100644
index 0000000..6c25e97
--- /dev/null
+++ b/playbook/roles/role-one/files/settings.json
@@ -0,0 +1,12 @@
+{
+    "blacklisted-desktop-dirs": "/usr/share/locale:/usr/share/app-install:/usr/share/kservices5:/usr/share/fk5:/usr/share/kservicetypes5:/usr/share/applications/screensavers:/usr/share/kde4:/usr/share/mimelnk",
+    "clear-previous-query": true,
+    "disable-desktop-filters": false,
+    "grab-mouse-pointer": false,
+    "hotkey-show-app": "<Primary>space",
+    "render-on-screen": "mouse-pointer-monitor",
+    "show-indicator-icon": true,
+    "show-recent-apps": "0",
+    "terminal-command": "",
+    "theme-name": "arc-dark"
+}
\ No newline at end of file
diff --git a/playbook/roles/role-one/tasks/comice-control.yml b/playbook/roles/role-one/tasks/comice-control.yml
index 8afb133..5f04d60 100644
--- a/playbook/roles/role-one/tasks/comice-control.yml
+++ b/playbook/roles/role-one/tasks/comice-control.yml
@@ -1,6 +1,7 @@
 ---
 
 - name: Comice Control center | Install dependencies
+  become: yes
   apt:
     name:
       - python3
@@ -10,7 +11,6 @@
       - wireless-tools
       - iproute2
       - alsa-utils
-      - python3-pip
 
 - name: Comice Control center | Clone git repository
   git:
diff --git a/playbook/roles/role-one/tasks/conky.yml b/playbook/roles/role-one/tasks/conky.yml
index 53f7578..cdb7fd2 100644
--- a/playbook/roles/role-one/tasks/conky.yml
+++ b/playbook/roles/role-one/tasks/conky.yml
@@ -1,6 +1,7 @@
 ---
 
 - name: Conky | Install dependencies
+  become: yes
   apt:
     name:
       - conky-all
@@ -21,5 +22,3 @@
   template:
     src: conky.desktop
     dest: "{{ autostart_path }}/conky.desktop"
-    owner: root
-    mode: '0644'
diff --git a/playbook/roles/role-one/tasks/customize-firefox.yml b/playbook/roles/role-one/tasks/customize-firefox.yml
index 6c97369..9494d75 100644
--- a/playbook/roles/role-one/tasks/customize-firefox.yml
+++ b/playbook/roles/role-one/tasks/customize-firefox.yml
@@ -1,9 +1,21 @@
 ---
 
+- name: Customize Firefox | Check if Firefox is installed
+  command: "which firefox"
+  register: firefox_check
+  ignore_errors: yes
+
+- name: Customize Firefox | Run firefox - Make sure its initialised
+  shell:
+    cmd: "nohup firefox &"
+  when: firefox_check.rc == 0
+
 - name: Customize Firefox | Close firefox if it's running
   shell:
     cmd: "pkill firefox"
   ignore_errors: true
+  when: firefox_check.rc == 0
 
 - name: Customize Firefox | Run Firefox Tweaks
   shell: "cd {{ home_directory }}/Downloads/WhiteSur-gtk-theme/ && ./tweaks.sh -f"
+  when: firefox_check.rc == 0
diff --git a/playbook/roles/role-one/tasks/file-manager.yml b/playbook/roles/role-one/tasks/file-manager.yml
index b798dc6..27860f2 100644
--- a/playbook/roles/role-one/tasks/file-manager.yml
+++ b/playbook/roles/role-one/tasks/file-manager.yml
@@ -1,9 +1,9 @@
 ---
 
 - name: File Manager | Install nautilus
+  become: yes
   apt:
-    name:
-      - nautilus
+    name: nautilus
     state: latest
 
 - name: File Manager | Make Nautilus default file manager
diff --git a/playbook/roles/role-one/tasks/general-changes.yml b/playbook/roles/role-one/tasks/general-changes.yml
index d42a01e..ae4f0c5 100644
--- a/playbook/roles/role-one/tasks/general-changes.yml
+++ b/playbook/roles/role-one/tasks/general-changes.yml
@@ -1,9 +1,11 @@
 ---
 
 - name: General Changes | Install xfce4
+  become: yes
   apt:
     name: xfce4
     state: latest
+    update_cache: yes
 
 - name: General Changes | Hide icons
   xfconf:
@@ -33,11 +35,23 @@
     value_type: bool
     value: "false"
 
+- name: General Changes | Make sure ~/Downloads directory exists
+  file:
+    path: "{{ home_directory }}/Downloads"
+    state: directory
+
+- name: General Changes | Check if already downloaded
+  file:
+    path: "{{ home_directory }}/Downloads/update-xfce-bigsur"
+    state: directory
+  register: update_xfce_bigsur_directory
+
 - name: General Changes | Download and Unzip update-xfce-bigsur.zip
   unarchive:
     src: "{{ update_xfce_bigsur_file_url }}"
     dest: "{{ home_directory }}/Downloads"
     remote_src: yes
+  when: update_xfce_bigsur_directory.changed
 
 - name: General Changes | Copy wallpapers to ~/Pictures
   copy:
@@ -48,6 +62,6 @@
 - name: General Changes | Change wallpaper
   xfconf:
     channel: "xfce4-desktop"
-    property: "/backdrop/screen0/monitorscreen/workspace0/last-image"
+    property: "/backdrop/screen0/monitor0/workspace0/last-image"
     value_type: "string"
-    value: "{{ home_directory }}/Pictures/wallpapers/Yosemite.png"
+    value: "{{ home_directory }}/Pictures/wallpapers/2560x1440.png"
diff --git a/playbook/roles/role-one/tasks/global-menu.yml b/playbook/roles/role-one/tasks/global-menu.yml
index 6d20c57..6672eb8 100644
--- a/playbook/roles/role-one/tasks/global-menu.yml
+++ b/playbook/roles/role-one/tasks/global-menu.yml
@@ -1,6 +1,7 @@
 ---
 
 - name: Global menu | Install dependencies
+  become: yes
   apt:
     name:
       - vala-panel-appmenu-common
diff --git a/playbook/roles/role-one/tasks/lightdm-greeter.yml b/playbook/roles/role-one/tasks/lightdm-greeter.yml
index 9b482f7..33d4dfa 100644
--- a/playbook/roles/role-one/tasks/lightdm-greeter.yml
+++ b/playbook/roles/role-one/tasks/lightdm-greeter.yml
@@ -1,41 +1,49 @@
 ---
 
+- name: LightDM-Webkit2-Greeter | Install dependencies
+  become: yes
+  apt:
+    name:
+      - liblightdm-gobject-1-dev
+      - python3-gi
+      - python3-pip
+      - zip
+
 - name: LightDM-Webkit2-Greeter | Install whither
   pip:
     name: whither
     state: latest
 
-- name: LightDM-Webkit2-Greeter | Install dependencies
-  apt:
-    name:
-      - liblightdm-gobject-1-dev
-      - python3-gi
-
 - name: LightDM-Webkit2-Greeter | Clone web-greeter
   git:
     repo: "{{ web_greeter_git }}"
     dest: /tmp/greeter
 
 - name: LightDM-Webkit2-Greeter | Install web-greeter
+  become: yes
   shell:
     cmd: "cd /tmp/greeter && make install"
 
 - name: LightDM-Webkit2-Greeter | Clone lightdm-webkit2-theme-glorious
+  become: yes
   git:
     repo: "{{ lightdm_webkit2_theme_glorious_git }}"
     dest: /usr/share/lightdm-webkit/themes/glorious
 
 - name: LightDM-Webkit2-Greeter | Place lightdm.conf
+  become: yes
   copy:
     src: lightdm.conf
     dest: "{{ lightdm_path }}/lightdm.conf"
 
 - name: LightDM-Webkit2-Greeter | Place web-greeter.yml
+  become: yes
   copy:
     src: web-greeter.yml
     dest: "{{ lightdm_path }}/web-greeter.yml"
 
 - name: LightDM-Webkit2-Greeter | Copy wallpapers
+  become: yes
   copy:
     src: "{{ home_directory }}/Pictures/wallpapers"
     dest: /usr/share/backgrounds
diff --git a/playbook/roles/role-one/tasks/picom-compositor.yml b/playbook/roles/role-one/tasks/picom-compositor.yml
index c097e54..8cf3a72 100644
--- a/playbook/roles/role-one/tasks/picom-compositor.yml
+++ b/playbook/roles/role-one/tasks/picom-compositor.yml
@@ -1,6 +1,7 @@
 ---
 
 - name: Picom | Install dependencies
+  become: yes
   apt:
     name: "{{ picom_dependency }}"
     state: present
@@ -12,6 +13,7 @@
     recursive: yes
 
 - name: Picom | Build and Install picom
+  become: yes
   shell: "cd /tmp/picom && meson --buildtype=release . build && ninja -C build && sudo ninja -C build install"
 
 - name: Picom | Copy picom config
diff --git a/playbook/roles/role-one/tasks/plank-dock.yml b/playbook/roles/role-one/tasks/plank-dock.yml
index c994b56..bacd97b 100644
--- a/playbook/roles/role-one/tasks/plank-dock.yml
+++ b/playbook/roles/role-one/tasks/plank-dock.yml
@@ -1,6 +1,7 @@
 ---
 
 - name: Plank Dock | Install plank dock
+  become: yes
   apt:
     name:
       - plank
@@ -12,14 +13,6 @@
     dest: "{{ home_directory }}/.local/share/plank/themes/"
     remote_src: yes
 
-- name: Plank Dock | Remove panel-2
-  xfconf:
-    channel: xfce4-panel
-    property: /panels
-    value_type: int
-    value: [1]
-    force_array: yes
-
 - name: Plank Dock | Copy launchpad icon
   copy:
     src: "{{ home_directory }}/Downloads/update-xfce-bigsur/icons/launchpad.svg"
@@ -39,8 +32,6 @@
   template:
     src: launchpad.dockitem
     dest: "{{ plank_dock_launcher_path }}/launchpad.dockitem"
-    owner: root
-    mode: '0644'
 
 - name: Plank Dock | Add thunar.dockitem to dock
   copy:
diff --git a/playbook/roles/role-one/tasks/rofi-launcher.yml b/playbook/roles/role-one/tasks/rofi-launcher.yml
index afd8286..4c253f3 100644
--- a/playbook/roles/role-one/tasks/rofi-launcher.yml
+++ b/playbook/roles/role-one/tasks/rofi-launcher.yml
@@ -1,6 +1,7 @@
 ---
 
 - name: Rofi Launcher | Install dependencies
+  become: yes
   apt:
     name:
       - rofi
diff --git a/playbook/roles/role-one/tasks/theme-icon-cursor-font.yml b/playbook/roles/role-one/tasks/theme-icon-cursor-font.yml
index 32ea3ac..3ce6b2c 100644
--- a/playbook/roles/role-one/tasks/theme-icon-cursor-font.yml
+++ b/playbook/roles/role-one/tasks/theme-icon-cursor-font.yml
@@ -1,10 +1,13 @@
 ---
 
 - name: Theme-icons-cursor-fonts | install dependencies
+  become: yes
   apt:
     name:
       - gtk2-engines-murrine
       - sassc
+      - git
+    update_cache: yes
 
 - name: Theme-icons-cursor-fonts | clone WhiteSur-gtk-theme
   git:
@@ -12,6 +15,7 @@
     dest: "{{ home_directory }}/Downloads/WhiteSur-gtk-theme"
 
 - name: Theme-icons-cursor-fonts | Install WhiteSur-gtk-theme
+  become: yes
   shell:
     cmd: "cd {{ home_directory }}/Downloads/WhiteSur-gtk-theme && ./install.sh -c dark -c light"
 
@@ -21,6 +25,7 @@
     dest: "{{ home_directory }}/Downloads/WhiteSur-icon-theme"
 
 - name: Theme-icons-cursor-fonts | Install WhiteSur-icon-theme
+  become: yes
   shell:
     cmd: "cd {{ home_directory }}/Downloads/WhiteSur-icon-theme && ./install.sh"
 
@@ -30,6 +35,7 @@
     dest: "{{ home_directory }}/Downloads/WhiteSur-cursors"
 
 - name: Theme-icons-cursor-fonts | Install WhiteSur-cursors
+  become: yes
   shell:
     cmd: "cd {{ home_directory }}/Downloads/WhiteSur-cursors && ./install.sh"
 
diff --git a/playbook/roles/role-one/tasks/ulauncher.yml b/playbook/roles/role-one/tasks/ulauncher.yml
index ab6f8de..4f0b907 100644
--- a/playbook/roles/role-one/tasks/ulauncher.yml
+++ b/playbook/roles/role-one/tasks/ulauncher.yml
@@ -1,15 +1,18 @@
 ---
 
 - name: Ulauncher | Add apt repository
+  become: yes
   apt_repository:
     repo: ppa:agornostal/ulauncher
     state: present
 
 - name: Ulauncher | Update apt cache
+  become: yes
   apt:
     update_cache: yes
 
 - name: Ulauncher | Install Ulauncher
+  become: yes
   apt:
     name: ulauncher
     state: latest
@@ -20,10 +23,10 @@
     dest: "{{ home_directory }}/.config/ulauncher/"
     remote_src: yes
 
-- name: Ulauncher | Update settings
-  shell:
-    cmd: "sed -i 's/\"theme-name\": \".*\"/\"theme-name\": \"arc-dark\"/g' {{ home_directory }}/.config/ulauncher/settings.json"
-    warn: false
+- name: Ulauncher | Copy settings
+  copy:
+    src: settings.json
+    dest: "{{ home_directory }}/.config/ulauncher/"
 
 - name: Ulauncher | Add in autostart
   copy:
diff --git a/playbook/roles/role-one/tasks/xfce-panel-plugins.yml b/playbook/roles/role-one/tasks/xfce-panel-plugins.yml
index 805ce8f..f11b0e5 100644
--- a/playbook/roles/role-one/tasks/xfce-panel-plugins.yml
+++ b/playbook/roles/role-one/tasks/xfce-panel-plugins.yml
@@ -146,3 +146,11 @@
     property: /panels/panel-1/plugin-ids
     value_type: int
     value: [26,1,3,30,5,29,28,6,7,8,9,10,11,12,13,14,27]
+
+- name: Xfce Panel | Remove panel-2
+  xfconf:
+    channel: xfce4-panel
+    property: /panels
+    value_type: int
+    value: [1]
+    force_array: yes
diff --git a/playbook/roles/role-one/tasks/xfce-terminal.yml b/playbook/roles/role-one/tasks/xfce-terminal.yml
index 8d8dccd..58fa713 100644
--- a/playbook/roles/role-one/tasks/xfce-terminal.yml
+++ b/playbook/roles/role-one/tasks/xfce-terminal.yml
@@ -7,11 +7,13 @@
     depth: 1
 
 - name: Terminal | Install zsh
+  become: yes
   apt:
     name: zsh
     state: present
 
 - name: Terminal | Change shell to zsh
+  become: yes
   shell:
     cmd: "chsh -s $(which zsh)"
 
@@ -29,6 +31,11 @@
   shell:
     cmd: "echo 'POWERLEVEL9K_DISABLE_CONFIGURATION_WIZARD=true' >>! ~/.zshrc"
 
+- name: Terminal | Make sure terminal_config_path directory exists
+  file:
+    path: "{{ terminal_config_path }}"
+    state: directory
+
 - name: Terminal | Copy terminal config
   copy:
     src: terminalrc
diff --git a/playbook/roles/role-one/vars/main.yml b/playbook/roles/role-one/vars/main.yml
index 6cd358a..e06bc26 100644
--- a/playbook/roles/role-one/vars/main.yml
+++ b/playbook/roles/role-one/vars/main.yml
@@ -1,9 +1,10 @@
 
-home_directory: /root
-plank_dock_launcher_path: /root/.config/plank/dock1/launchers
-autostart_path: /root/.config/autostart
+user: testuser
+home_directory: /home/{{ user }}
+plank_dock_launcher_path: "{{ home_directory }}/.config/plank/dock1/launchers"
+autostart_path: "{{ home_directory }}/.config/autostart"
 lightdm_path: /etc/lightdm
-terminal_config_path: /root/.config/xfce4/terminal
+terminal_config_path: "{{ home_directory }}/.config/xfce4/terminal"
 
 picom_dependency:
   - cmake
diff --git a/playbook/setup.yml b/playbook/setup.yml
index a3106ae..b0b8f12 100644
--- a/playbook/setup.yml
+++ b/playbook/setup.yml
@@ -2,6 +2,6 @@
 
 - name: Apply role-one to all nodes
   hosts: all
-  remote_user: root
+  remote_user: testuser
   roles:
     - role-one
diff --git a/readme.txt b/readme.txt
index 5db5603..93f80c9 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,3 +1,5 @@
+## ansible-pull -o -d ~/Documents/modify-desktop-ansible -i ~/Documents/inventory -U https://git.bitmessage.org/swapnil/customize-xfce-anisble.git ~/Documents/modify-desktop-ansible/playbook/setup.yml
+
 - install xfce
 	- sudo apt install xfce4