diff --git a/ansible.cfg b/ansible.cfg
index 9dd5b45..a4f9da6 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -1,11 +1,12 @@
 [defaults]
 roles_path = ./roles
-remote_user = root
+#remote_user = root
 host_key_checking = False
 gathering = smart
 forks = 50
 timeout = 10
 retry_files_enabled = False
+remote_tmp = /tmp
 
 [ssh_connection]
 pipelining = True
diff --git a/group_vars/all.yml b/group_vars/all.yml
index 785610b..2be62f8 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -33,8 +33,8 @@ systemd_disabled: []
 ###
 ### System Python versions
 ###
-python_2: yes
-python_3: yes
+python_2: True
+python_3: True
 
 
 ###
@@ -125,11 +125,11 @@ docker_repo_channel: stable
 
 # ---- FZF ----
 # Add sourcing ~/.fzf.bash to your normal shell config?
-fzf_update_rc: Yes
+fzf_update_rc: True
 # Enable/Disable fuzzy completion (bash & zsh)?
-fzf_completion: No
+fzf_completion: False
 # Enable/disable key bindings (CTRL-T, CTRL-R, ALT-C)?
-fzf_key_bindings: No
+fzf_key_bindings: False
 
 # ---- HipChat ----
 # 'wheezy', 'jessie', 'stretch' or 'buster'
@@ -138,17 +138,17 @@ hipchat_repo_dist: stretch
 # ---- LXDM ----
 lxdm_dpi: 96
 lxdm_gtk_theme: Industrial
-lxdm_show_user_list: no
+lxdm_show_user_list: False
 
 # ---- NetworkManager ----
-network_manager_nm_applet: Yes
-network_manager_plugin_openvpn: Yes
-network_manager_plugin_l2tp: No
-network_manager_plugin_openconnect: No
-network_manager_plugin_pptp: No
-network_manager_plugin_ssh: No
-network_manager_plugin_strongswan: No
-network_manager_plugin_vpnc: No
+network_manager_nm_applet: True
+network_manager_plugin_openvpn: True
+network_manager_plugin_l2tp: False
+network_manager_plugin_openconnect: False
+network_manager_plugin_pptp: False
+network_manager_plugin_ssh: False
+network_manager_plugin_strongswan: False
+network_manager_plugin_vpnc: False
 
 # ---- Skype ----
 # 'stable' or 'unstable'
@@ -160,11 +160,11 @@ sublime_repo_channel: stable
 
 # ---- sxiv ----
 # Make sxiv default program for pictures
-sxiv_default_image_viewer: yes
+sxiv_default_image_viewer: True
 
 # ---- Thunar ----
-thunar_volman_enable: yes
-thunar_archive_plugin_enable: yes
+thunar_volman_enable: True
+thunar_archive_plugin_enable: True
 
 # ---- Thunderbird ----
 thunderbird_ext_official: []
@@ -186,9 +186,9 @@ xorg_gpu: modesetting
 # Supported values: 'XAA' 'EXA' 'UXA' 'SNA' 'glamor'
 xorg_gpu_accel_method: glamor
 # Enable VDPAU_DRIVER=va_gl systemwide
-xorg_gpu_vdpau_va_gl_enable: yes
+xorg_gpu_vdpau_va_gl_enable: True
 # 'libinput' or 'synaptics'
-xorg_touchpad_enable: yes
+xorg_touchpad_enable: True
 xorg_touchpad_driver: 'synaptics'
 
 
diff --git a/host_vars/cytopia-t470p.yml b/host_vars/cytopia-t470p.yml
index 08d5de5..a59a46a 100644
--- a/host_vars/cytopia-t470p.yml
+++ b/host_vars/cytopia-t470p.yml
@@ -46,8 +46,8 @@ systemd_disabled:
 ###
 ### System Python versions
 ###
-python_2: yes
-python_3: yes
+python_2: True
+python_3: True
 
 
 ###
@@ -266,26 +266,26 @@ docker_repo_channel: edge
 
 # ---- FZF ----
 # Add sourcing ~/.fzf.bash to your normal shell config?
-fzf_update_rc: Yes
+fzf_update_rc: True
 # Enable/Disable fuzzy completion (bash & zsh)?
-fzf_completion: No
+fzf_completion: False
 # Enable/disable key bindings (CTRL-T, CTRL-R, ALT-C)?
-fzf_key_bindings: No
+fzf_key_bindings: False
 
 # ---- LXDM ----
 lxdm_dpi: 128
 lxdm_gtk_theme: Arc-Darker
-lxdm_show_user_list: no
+lxdm_show_user_list: False
 
 # ---- NetworkManager ----
-network_manager_nm_applet: Yes
-network_manager_plugin_openvpn: Yes
-network_manager_plugin_l2tp: No
-network_manager_plugin_openconnect: No
-network_manager_plugin_pptp: No
-network_manager_plugin_ssh: No
-network_manager_plugin_strongswan: No
-network_manager_plugin_vpnc: No
+network_manager_nm_applet: True
+network_manager_plugin_openvpn: True
+network_manager_plugin_l2tp: False
+network_manager_plugin_openconnect: False
+network_manager_plugin_pptp: False
+network_manager_plugin_ssh: False
+network_manager_plugin_strongswan: False
+network_manager_plugin_vpnc: False
 
 # ---- Skype ----
 # 'stable' or 'unstable'
@@ -297,11 +297,11 @@ sublime_repo_channel: stable
 
 # ---- sxiv ----
 # Make sxiv default program for pictures
-sxiv_default_image_viewer: yes
+sxiv_default_image_viewer: True
 
 # ---- Thunar ----
-thunar_volman_enable: yes
-thunar_archive_plugin_enable: yes
+thunar_volman_enable: True
+thunar_archive_plugin_enable: True
 
 # ---- Thunderbird ----
 thunderbird_ext_apt:
@@ -327,9 +327,9 @@ xorg_gpu: modesetting
 # Supported values: 'XAA' 'EXA' 'UXA' 'SNA' 'glamor'
 xorg_gpu_accel_method: glamor
 # Enable VDPAU_DRIVER=va_gl systemwide
-xorg_gpu_vdpau_va_gl_enable: yes
+xorg_gpu_vdpau_va_gl_enable: True
 # 'libinput' or 'synaptics'
-xorg_touchpad_enable: yes
+xorg_touchpad_enable: True
 xorg_touchpad_driver: 'synaptics'
 
 
diff --git a/host_vars/generic-all.yml b/host_vars/generic-all.yml
index 1aca83f..952ce75 100644
--- a/host_vars/generic-all.yml
+++ b/host_vars/generic-all.yml
@@ -13,19 +13,19 @@ debian_dist: buster
 apt_repo_repositories:
   # main
   - file: debian-main
-    repo: "deb http://deb.debian.org/debian {{ debian_dist }} main"
+    repo: "deb http://deb.debian.org/debian {{ debian_dist }} main contrib non-free"
   - file: debian-main
-    repo: "deb-src http://deb.debian.org/debian {{ debian_dist }} main"
+    repo: "deb-src http://deb.debian.org/debian {{ debian_dist }} main contrib non-free"
   # updates
   - file: debian-updates
-    repo: "deb http://deb.debian.org/debian {{ debian_dist }}-updates main"
+    repo: "deb http://deb.debian.org/debian {{ debian_dist }}-updates main contrib non-free"
   - file: debian-updates
-    repo: "deb-src http://deb.debian.org/debian {{ debian_dist }}-updates main"
+    repo: "deb-src http://deb.debian.org/debian {{ debian_dist }}-updates main contrib non-free"
   # security
   - file: debian-security
-    repo: "deb http://security.debian.org {{ debian_dist }}/updates main"
+    repo: "deb http://security.debian.org {{ debian_dist }}/updates main contrib non-free"
   - file: debian-security
-    repo: "deb-src http://security.debian.org {{ debian_dist }}/updates main"
+    repo: "deb-src http://security.debian.org {{ debian_dist }}/updates main contrib non-free"
 
 
 ###
@@ -39,8 +39,8 @@ systemd_disabled: []
 ###
 ### System Python versions
 ###
-python_2: yes
-python_3: yes
+python_2: True
+python_3: True
 
 
 ###
@@ -131,11 +131,11 @@ docker_repo_channel: edge
 
 # ---- FZF ----
 # Add sourcing ~/.fzf.bash to your normal shell config?
-fzf_update_rc: Yes
+fzf_update_rc: True
 # Enable/Disable fuzzy completion (bash & zsh)?
-fzf_completion: No
+fzf_completion: False
 # Enable/disable key bindings (CTRL-T, CTRL-R, ALT-C)?
-fzf_key_bindings: No
+fzf_key_bindings: False
 
 # ---- HipChat ----
 # 'wheezy', 'jessie', 'stretch' or 'buster'
@@ -144,17 +144,17 @@ hipchat_repo_dist: "{{ debian_dist }}"
 # ---- LXDM ----
 lxdm_dpi: 96
 lxdm_gtk_theme: Industrial
-lxdm_show_user_list: no
+lxdm_show_user_list: False
 
 # ---- NetworkManager ----
-network_manager_nm_applet: Yes
-network_manager_plugin_openvpn: Yes
-network_manager_plugin_l2tp: Yes
-network_manager_plugin_openconnect: Yes
-network_manager_plugin_pptp: Yes
-network_manager_plugin_ssh: Yes
-network_manager_plugin_strongswan: Yes
-network_manager_plugin_vpnc: Yes
+network_manager_nm_applet: True
+network_manager_plugin_openvpn: True
+network_manager_plugin_l2tp: True
+network_manager_plugin_openconnect: True
+network_manager_plugin_pptp: True
+network_manager_plugin_ssh: True
+network_manager_plugin_strongswan: True
+network_manager_plugin_vpnc: True
 
 # ---- Skype ----
 # 'stable' or 'unstable'
@@ -166,11 +166,11 @@ sublime_repo_channel: stable
 
 # ---- sxiv ----
 # Make sxiv default program for pictures
-sxiv_default_image_viewer: yes
+sxiv_default_image_viewer: True
 
 # ---- Thunar ----
-thunar_volman_enable: yes
-thunar_archive_plugin_enable: yes
+thunar_volman_enable: True
+thunar_archive_plugin_enable: True
 
 # ---- Thunderbird ----
 thunderbird_ext_official: []
@@ -192,9 +192,9 @@ xorg_gpu: modesetting
 # Supported values: 'XAA' 'EXA' 'UXA' 'SNA' 'glamor'
 xorg_gpu_accel_method: glamor
 # Enable VDPAU_DRIVER=va_gl systemwide
-xorg_gpu_vdpau_va_gl_enable: yes
+xorg_gpu_vdpau_va_gl_enable: True
 # 'libinput' or 'synaptics'
-xorg_touchpad_enable: yes
+xorg_touchpad_enable: True
 xorg_touchpad_driver: 'synaptics'
 
 
diff --git a/roles/apt-meta/handlers/main.yml b/roles/apt-meta/handlers/main.yml
deleted file mode 100644
index 9cb8976..0000000
--- a/roles/apt-meta/handlers/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-
-- name: clean apt
-  apt:
-    autoclean: yes
-    autoremove: yes
-  become: yes
diff --git a/roles/apt-meta/tasks/main.yml b/roles/apt-meta/tasks/main.yml
index b3eeb9a..8287891 100644
--- a/roles/apt-meta/tasks/main.yml
+++ b/roles/apt-meta/tasks/main.yml
@@ -2,24 +2,23 @@
 
 #- name: ensure apt cache is up to date
 #  apt:
-#    force_apt_get: yes
-#    update_cache: yes
+#    force_apt_get: True
+#    update_cache: True
 #    cache_valid_time: 3600
-#  become: yes
 #  changed_when: False
 #  check_mode: False
+#  become: True
 
 - name: ensure apt packages are managed
   apt:
     state: "{{ apt_state }}"
     name: "{{ packages }}"
-    autoclean: yes
-    autoremove: yes
-    force_apt_get: yes
-    update_cache: yes
+    autoclean: True
+    autoremove: True
+    force_apt_get: True
+    update_cache: True
     cache_valid_time: 3600
-    install_recommends: no
+    install_recommends: False
   vars:
     packages: "{{ apt_packages }}"
-  become: yes
-  #notify: clean apt
+  become: True
diff --git a/roles/apt-repo-meta/handlers/main.yml b/roles/apt-repo-meta/handlers/main.yml
index f266b40..988cfbb 100644
--- a/roles/apt-repo-meta/handlers/main.yml
+++ b/roles/apt-repo-meta/handlers/main.yml
@@ -3,5 +3,5 @@
 - name: update apt repository cache
   apt:
     cache_valid_time: 1
-    update_cache: yes
-  become: yes
+    update_cache: True
+  become: True
diff --git a/roles/apt-repo-meta/tasks/main.yml b/roles/apt-repo-meta/tasks/main.yml
index f912102..5176032 100644
--- a/roles/apt-repo-meta/tasks/main.yml
+++ b/roles/apt-repo-meta/tasks/main.yml
@@ -4,15 +4,15 @@
   apt:
     state: latest
     name: "{{ apt_repo_packages }}"
-    update_cache: yes
-    install_recommends: no
-  become: yes
+    update_cache: True
+    install_recommends: False
+  become: True
 
 - name: ensure default sources.list is removed
   file:
     state: absent
     path: /etc/apt/sources.list
-  become: yes
+  become: True
   notify: update apt repository cache
 
 - name: ensure apt keys are managed
@@ -22,8 +22,8 @@
     file: "{{ item.file | default(omit) }}"
     keyserver: "{{ item.keyserver | default(omit) }}"
     url: "{{ item.url | default(omit) }}"
-    validate_certs: yes
-  become: yes
+    validate_certs: True
+  become: True
   with_items:
     - "{{ apt_repo_keys }}"
   notify: update apt repository cache
@@ -33,9 +33,9 @@
     state: "{{ apt_repo_state }}"
     repo: "{{ item.repo }}"
     filename: "{{ item.file }}"
-    validate_certs: yes
-    update_cache: yes
-  become: yes
+    validate_certs: True
+    update_cache: True
+  become: True
   with_items:
     - "{{ apt_repo_repositories }}"
   notify: update apt repository cache
diff --git a/roles/autorunner/tasks/install.yml b/roles/autorunner/tasks/install.yml
index 66ce9f1..c49d9f4 100644
--- a/roles/autorunner/tasks/install.yml
+++ b/roles/autorunner/tasks/install.yml
@@ -11,10 +11,10 @@
     url: https://raw.githubusercontent.com/cytopia/autorunner/master/autorunner
     dest: "{{ autorunner_bin_path }}/autorunner"
     mode: 0755
-    force: yes
+    force: True
     timeout: 30
   register: task_result
   until: task_result is succeeded
   retries: 10
   delay: 5
-  become: yes
+  become: True
diff --git a/roles/autorunner/tasks/uninstall.yml b/roles/autorunner/tasks/uninstall.yml
index dbdcd71..6718f02 100644
--- a/roles/autorunner/tasks/uninstall.yml
+++ b/roles/autorunner/tasks/uninstall.yml
@@ -4,4 +4,4 @@
   file:
     state: absent
     path: "{{ autorunner_bin_path }}/autorunner"
-  become: yes
+  become: True
diff --git a/roles/chromium/tasks/install.yml b/roles/chromium/tasks/install.yml
index 825b02d..e752146 100644
--- a/roles/chromium/tasks/install.yml
+++ b/roles/chromium/tasks/install.yml
@@ -11,8 +11,8 @@
     state: directory
     path: "{{ chromium_extensions_dir }}"
     mode: 0755
-  check_mode: no
-  become: Yes
+  check_mode: False
+  become: True
 
 - name: ensure chromium extension configs are copied
   copy:
@@ -21,7 +21,7 @@
     owner: root
     group: root
     mode: 0644
-  become: yes
+  become: True
   with_items:
     - "{{ chromium_extensions }}"
 
@@ -29,31 +29,31 @@
   find:
     paths: "{{ chromium_extensions_dir }}"
     file_type: any
-  check_mode: no
+  check_mode: False
   register: chromium_all_extension_files
 
 - name: set chromium wanted extensions
   set_fact:
     chromium_extensions_abs: "{{ chromium_extensions_abs | default([]) + [chromium_extensions_dir + '/' + item + '.json'] }}"
-  check_mode: no
+  check_mode: False
   with_items:
     - "{{ chromium_extensions }}"
 
 - name: set chromium wanted extensions
   set_fact:
     chromium_extensions_abs: []
-  check_mode: no
+  check_mode: False
   when: not chromium_extensions
 
 - name: get array of unmanaged chrome extension files to remove
   set_fact:
     chromium_extensions_to_remove: "{{ chromium_all_extension_files.files | default([]) | json_query('[].path') | difference(chromium_extensions_abs) }}"
-  check_mode: no
+  check_mode: False
 
 - name: ensure unwanted chromium extension configs are removed
   file:
     state: absent
     path: "{{ item }}"
-  become: yes
+  become: True
   with_items:
     - "{{ chromium_extensions_to_remove }}"
diff --git a/roles/clipmenu/tasks/install.yml b/roles/clipmenu/tasks/install.yml
index 8fcfce3..05dbac1 100644
--- a/roles/clipmenu/tasks/install.yml
+++ b/roles/clipmenu/tasks/install.yml
@@ -11,13 +11,13 @@
     url: "https://raw.githubusercontent.com/cdown/clipmenu/develop/{{ item }}"
     dest: "{{ clipmenu_bin_path }}/{{ item }}"
     mode: 0755
-    force: yes
+    force: True
     timeout: 30
   register: task_result
   until: task_result is succeeded
   retries: 10
   delay: 5
-  become: yes
+  become: True
   with_items:
     - clipmenu
     - clipmenud
diff --git a/roles/clipmenu/tasks/uninstall.yml b/roles/clipmenu/tasks/uninstall.yml
index 90bf9b3..e2d18a9 100644
--- a/roles/clipmenu/tasks/uninstall.yml
+++ b/roles/clipmenu/tasks/uninstall.yml
@@ -4,7 +4,7 @@
   file:
     state: absent
     path: "{{ clipmenu_bin_path }}/{{ item }}"
-  become: yes
+  become: True
   with_items:
     - clipmenu
     - clipmenud
diff --git a/roles/dbeaver/handlers/main.yml b/roles/dbeaver/handlers/main.yml
index 9a55359..869abe5 100644
--- a/roles/dbeaver/handlers/main.yml
+++ b/roles/dbeaver/handlers/main.yml
@@ -3,4 +3,4 @@
 - name: install dbeaver
   apt:
     deb: "{{ dbeaver_deb_path }}"
-  become: yes
+  become: True
diff --git a/roles/dbeaver/tasks/install.yml b/roles/dbeaver/tasks/install.yml
index 8e5e2ad..179764f 100644
--- a/roles/dbeaver/tasks/install.yml
+++ b/roles/dbeaver/tasks/install.yml
@@ -17,7 +17,7 @@
     url: "{{ dbeaver_deb_url }}"
     dest: "{{ dbeaver_deb_path }}"
     mode: 0644
-    force: yes
+    force: True
     timeout: 30
   register: task_result
   until: task_result is succeeded
diff --git a/roles/diff-highlight/tasks/install.yml b/roles/diff-highlight/tasks/install.yml
index 9fd6797..72e425f 100644
--- a/roles/diff-highlight/tasks/install.yml
+++ b/roles/diff-highlight/tasks/install.yml
@@ -5,10 +5,10 @@
     url: https://raw.githubusercontent.com/K-Phoen/Config/master/bin/diff-highlight
     dest: "{{ diff_highlight_path }}"
     mode: 0755
-    force: yes
+    force: True
     timeout: 30
   register: task_result
   until: task_result is succeeded
   retries: 10
   delay: 5
-  become: yes
+  become: True
diff --git a/roles/diff-highlight/tasks/uninstall.yml b/roles/diff-highlight/tasks/uninstall.yml
index 76f102d..4c0c7d7 100644
--- a/roles/diff-highlight/tasks/uninstall.yml
+++ b/roles/diff-highlight/tasks/uninstall.yml
@@ -4,4 +4,4 @@
   file:
     state: absent
     path: "{{ diff_highlight_path }}"
-  become: yes
+  become: True
diff --git a/roles/docker-compose/tasks/install.yml b/roles/docker-compose/tasks/install.yml
index bddbefd..ba29d1b 100644
--- a/roles/docker-compose/tasks/install.yml
+++ b/roles/docker-compose/tasks/install.yml
@@ -11,22 +11,22 @@
 #    url: https://api.github.com/repos/docker/compose/releases/latest
 #    method: GET
 #  register: docker_json
-#  check_mode: no
+#  check_mode: False
 #
 #- name: set latest docker compose version
 #  set_fact:
 #    docker_compose_version: "{{ docker_json.json.name }}"
-#  check_mode: no
+#  check_mode: False
 #
 #- name: ensure docker compose is downloaded
 #  get_url:
 #    url: "https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-Linux-x86_64"
 #    dest: "{{ docker_compose_path }}"
 #    mode: 0755
-#    force: yes
+#    force: True
 #    timeout: 30
 #  register: task_result
 #  until: task_result is succeeded
 #  retries: 10
 #  delay: 5
-#  become: yes
+#  become: True
diff --git a/roles/docker-compose/tasks/uninstall.yml b/roles/docker-compose/tasks/uninstall.yml
index 48a346b..ca53974 100644
--- a/roles/docker-compose/tasks/uninstall.yml
+++ b/roles/docker-compose/tasks/uninstall.yml
@@ -11,4 +11,4 @@
 #  file:
 #    state: absent
 #    path: "{{ docker_compose_path }}"
-#  become: yes
+#  become: True
diff --git a/roles/docker/tasks/install.yml b/roles/docker/tasks/install.yml
index 33a6e4e..0ce8534 100644
--- a/roles/docker/tasks/install.yml
+++ b/roles/docker/tasks/install.yml
@@ -18,13 +18,13 @@
 - name: set username
   command: whoami
   register: docker_username
-  check_mode: no
+  check_mode: False
   changed_when: False
 
 - name: ensure user is added to docker group
   user:
     name: "{{ docker_username.stdout }}"
     groups: docker
-    append: yes
+    append: True
     update_password: on_create
-  become: yes
+  become: True
diff --git a/roles/ffscreencast/tasks/install.yml b/roles/ffscreencast/tasks/install.yml
index 09f6284..36e9536 100644
--- a/roles/ffscreencast/tasks/install.yml
+++ b/roles/ffscreencast/tasks/install.yml
@@ -11,10 +11,10 @@
     url: https://raw.githubusercontent.com/cytopia/ffscreencast/master/bin/ffscreencast
     dest: "{{ ffscreencast_bin_path }}/ffscreencast"
     mode: 0755
-    force: yes
+    force: True
     timeout: 30
   register: task_result
   until: task_result is succeeded
   retries: 10
   delay: 5
-  become: yes
+  become: True
diff --git a/roles/ffscreencast/tasks/uninstall.yml b/roles/ffscreencast/tasks/uninstall.yml
index 2a2da7c..a233611 100644
--- a/roles/ffscreencast/tasks/uninstall.yml
+++ b/roles/ffscreencast/tasks/uninstall.yml
@@ -4,4 +4,4 @@
   file:
     state: absent
     path: "{{ ffscreencast_bin_path }}/ffscreencast"
-  become: yes
+  become: True
diff --git a/roles/firefox/tasks/install.yml b/roles/firefox/tasks/install.yml
index f065d09..4468fce 100644
--- a/roles/firefox/tasks/install.yml
+++ b/roles/firefox/tasks/install.yml
@@ -12,16 +12,16 @@
     path: "{{ firefox_path }}"
     state: directory
     mode: 0755
-  become: yes
+  become: True
 
 - name: ensure firefox is downloaded
   unarchive:
     src: "{{ firefox_url }}"
     dest: "{{ firefox_path }}"
-    remote_src: yes
+    remote_src: True
     owner: root
     group: root
-  become: yes
+  become: True
 
 - name: ensure firefox is symlinked to bin
   file:
@@ -30,7 +30,7 @@
     owner: root
     group: root
     state: link
-  become: yes
+  become: True
 
 - name: ensure firefox desktop application file is present
   template:
@@ -39,4 +39,4 @@
     owner: root
     group: root
     mode: 0644
-  become: yes
+  become: True
diff --git a/roles/firefox/tasks/uninstall.yml b/roles/firefox/tasks/uninstall.yml
index 18df7cb..be80c60 100644
--- a/roles/firefox/tasks/uninstall.yml
+++ b/roles/firefox/tasks/uninstall.yml
@@ -4,16 +4,16 @@
   file:
     path: "{{ firefox_path }}/firefox"
     state: absent
-  become: yes
+  become: True
 
 - name: ensure firefox symlink is removed
   file:
     path: "{{ firefox_bin_path }}"
     state: absent
-  become: yes
+  become: True
 
 - name: ensure firefox desktop application file is removed
   file:
     path: "{{ firefox_desktop_path }}"
     state: absent
-  become: yes
+  become: True
diff --git a/roles/font-droid-sans-mono/tasks/install.yml b/roles/font-droid-sans-mono/tasks/install.yml
index 0135116..f5034c5 100644
--- a/roles/font-droid-sans-mono/tasks/install.yml
+++ b/roles/font-droid-sans-mono/tasks/install.yml
@@ -12,7 +12,7 @@
     url: "{{ item }}"
     dest: "{{ font_droid_sans_mono_font_path }}/{{ item | basename | replace('%20', ' ') }}"
     mode: 0644
-    force: yes
+    force: True
     timeout: 30
   register: task_result
   until: task_result is succeeded
diff --git a/roles/font-font-awesome/tasks/install.yml b/roles/font-font-awesome/tasks/install.yml
index 51638ae..5b27b30 100644
--- a/roles/font-font-awesome/tasks/install.yml
+++ b/roles/font-font-awesome/tasks/install.yml
@@ -12,7 +12,7 @@
     url: "{{ item }}"
     dest: "{{ font_font_awesome_font_path }}/{{ item | basename | replace('%20', ' ') }}"
     mode: 0644
-    force: yes
+    force: True
     timeout: 30
   register: task_result
   until: task_result is succeeded
diff --git a/roles/font-san-francisco/tasks/install.yml b/roles/font-san-francisco/tasks/install.yml
index 0b1a225..8102cbd 100644
--- a/roles/font-san-francisco/tasks/install.yml
+++ b/roles/font-san-francisco/tasks/install.yml
@@ -12,7 +12,7 @@
     url: "{{ item }}"
     dest: "{{ font_san_francisco_font_path }}/{{ item | basename | replace('%20', ' ') }}"
     mode: 0644
-    force: yes
+    force: True
     timeout: 30
   register: task_result
   until: task_result is succeeded
diff --git a/roles/font-terminus/tasks/install.yml b/roles/font-terminus/tasks/install.yml
index 9101bf9..9166d0e 100644
--- a/roles/font-terminus/tasks/install.yml
+++ b/roles/font-terminus/tasks/install.yml
@@ -12,7 +12,7 @@
     url: "{{ item }}"
     dest: "{{ font_terminus_font_path }}/{{ item | basename | replace('%20', ' ') }}"
     mode: 0644
-    force: yes
+    force: True
     timeout: 30
   register: task_result
   until: task_result is succeeded
diff --git a/roles/font-ubuntu/tasks/install.yml b/roles/font-ubuntu/tasks/install.yml
index 7e29f00..da7281f 100644
--- a/roles/font-ubuntu/tasks/install.yml
+++ b/roles/font-ubuntu/tasks/install.yml
@@ -11,17 +11,17 @@
   uri:
     url: https://design.ubuntu.com/font/
     method: GET
-    follow_redirects: yes
-    return_content: yes
+    follow_redirects: True
+    return_content: True
   register: font_ubuntu_raw
-  check_mode: no
+  check_mode: False
 
 - name: set ubuntu font url
   set_fact:
     font_ubuntu_zip: "{{ font_ubuntu_raw.content | regex_search(qry) }}"
   vars:
     qry: 'https://assets.ubuntu.com/.*-ubuntu-font-family-[.0-9]+\.zip'
-  check_mode: no
+  check_mode: False
 
 - name: ensure font directory exists
   file:
@@ -36,20 +36,20 @@
 - name: get current user
   shell: "whoami"
   register: font_ubuntu_user
-  check_mode: no
+  check_mode: False
   changed_when: False
 - name: get current user group
   shell: "getent group {{ font_ubuntu_user.stdout }} | awk -F ':' '{print $1}'"
   register: font_ubuntu_group
-  check_mode: no
+  check_mode: False
   changed_when: False
 - name: ensure ubuntu font is downloaded
   unarchive:
     src: "{{ font_ubuntu_zip }}"
     dest: "{{ font_ubuntu_font_path }}"
-    remote_src: yes
+    remote_src: True
     owner: "{{ font_ubuntu_user.stdout }}"
     group: "{{ font_ubuntu_group.stdout }}"
     #mode: 0755
-  become: yes
+  become: True
   notify: update font-cache
diff --git a/roles/font-ubuntu/tasks/uninstall.yml b/roles/font-ubuntu/tasks/uninstall.yml
index 2e18dc7..9dadddf 100644
--- a/roles/font-ubuntu/tasks/uninstall.yml
+++ b/roles/font-ubuntu/tasks/uninstall.yml
@@ -5,7 +5,7 @@
     path: "{{ font_ubuntu_font_path }}"
     pattern: '^ubuntu-font-family-[.0-9]+$'
     file_type: directory
-    use_regex: yes
+    use_regex: True
   register: font_ubuntu_font_dirs
 
 - name: ensure ubuntu font directory is removed
diff --git a/roles/fzf/defaults/main.yml b/roles/fzf/defaults/main.yml
index f8b32eb..9874142 100644
--- a/roles/fzf/defaults/main.yml
+++ b/roles/fzf/defaults/main.yml
@@ -4,10 +4,10 @@
 fzf: 'ignore'
 
 # Add sourcing ~/.fzf.bash to your normal shell config?
-fzf_update_rc: Yes
+fzf_update_rc: True
 
 # Enable/Disable fuzzy completion (bash & zsh)?
-fzf_completion: No
+fzf_completion: False
 
 # Enable/disable key bindings (CTRL-T, CTRL-R, ALT-C)?
-fzf_key_bindings: No
+fzf_key_bindings: False
diff --git a/roles/fzf/tasks/install.yml b/roles/fzf/tasks/install.yml
index 605a817..e04562b 100644
--- a/roles/fzf/tasks/install.yml
+++ b/roles/fzf/tasks/install.yml
@@ -11,31 +11,31 @@
     state: directory
     path: "{{ fzf_path }}"
     mode: 0755
-  check_mode: no
+  check_mode: False
 
 - name: ensure fzf is cloned
   git:
     repo: https://github.com/junegunn/fzf
-    clone: yes
+    clone: True
     dest: "{{ fzf_path }}"
-    force: yes
-    update: yes
+    force: True
+    update: True
     depth: 1
 
 - name: set fzf install command generate rc
   set_fact:
     fzf_cmd_rc: "{% if fzf_update_rc %}--update-rc{% else %}--no-update-rc{% endif %}"
-  check_mode: no
+  check_mode: False
 
 - name: set fzf install command shell completion
   set_fact:
     fzf_cmd_comp: "{% if fzf_completion %}--completion{% else %}--no-completion{% endif %}"
-  check_mode: no
+  check_mode: False
 
 - name: set fzf install command key bindings
   set_fact:
     fzf_cmd_key: "{% if fzf_key_bindings %}--key-bindings{% else %}--no-key-bindings{% endif %}"
-  check_mode: no
+  check_mode: False
 
 - name: ensure fzf install script is run
   command: "{{ fzf_path }}/install --bin --64"
diff --git a/roles/gimp/tasks/install.yml b/roles/gimp/tasks/install.yml
index f21783c..3608a48 100644
--- a/roles/gimp/tasks/install.yml
+++ b/roles/gimp/tasks/install.yml
@@ -3,7 +3,7 @@
 - name: check if gimp is already installed
   command: "dpkg-query -s {{ gimp_package_name }}"
   register: gimp_installed
-  check_mode: no
+  check_mode: False
   failed_when: gimp_installed.rc > 1
   changed_when: gimp_installed.rc == 1
 
@@ -39,5 +39,5 @@
   unarchive:
     src: "{{ gimp_theme_url }}"
     dest: "{{ gimp_theme_dir }}"
-    remote_src: yes
+    remote_src: True
     #mode: 0755
diff --git a/roles/i3-gaps/handlers/main.yml b/roles/i3-gaps/handlers/main.yml
index 5eb5994..6341589 100644
--- a/roles/i3-gaps/handlers/main.yml
+++ b/roles/i3-gaps/handlers/main.yml
@@ -23,4 +23,4 @@
   command: make install
   args:
     chdir: "{{ i3_gaps_git_path }}/build"
-  become: yes
+  become: True
diff --git a/roles/i3-gaps/tasks/install.yml b/roles/i3-gaps/tasks/install.yml
index a8d24e8..07bf750 100644
--- a/roles/i3-gaps/tasks/install.yml
+++ b/roles/i3-gaps/tasks/install.yml
@@ -20,7 +20,7 @@
     | sort -V \
     | tail -1
   register: i3_gaps_release_tag
-  check_mode: no
+  check_mode: False
   changed_when: False
 
 - name: ensure i3-gaps is cloned
@@ -28,10 +28,10 @@
     repo: "{{ i3_gaps_git_url }}"
     dest: "{{ i3_gaps_git_path }}"
     version: "{{ i3_gaps_release_tag.stdout }}"
-    clone: yes
-    force: yes
-    recursive: yes
-    update: yes
+    clone: True
+    force: True
+    recursive: True
+    update: True
     depth: 1
   notify:
     - autoreconf i3-gaps
diff --git a/roles/i3-gaps/tasks/uninstall.yml b/roles/i3-gaps/tasks/uninstall.yml
index 1be911f..8a7e357 100644
--- a/roles/i3-gaps/tasks/uninstall.yml
+++ b/roles/i3-gaps/tasks/uninstall.yml
@@ -9,7 +9,7 @@
   command: make uninstall
   args:
     chdir: "{{ i3_gaps_git_path }}/build"
-  become: yes
+  become: True
   when: i3_gaps_build_dir.stat.exists
 
 - name: ensure i3-gaps git directory is removed
diff --git a/roles/i3-utils-bin/tasks/install.yml b/roles/i3-utils-bin/tasks/install.yml
index c5170e9..423934f 100644
--- a/roles/i3-utils-bin/tasks/install.yml
+++ b/roles/i3-utils-bin/tasks/install.yml
@@ -11,13 +11,13 @@
     url: "https://raw.githubusercontent.com/cytopia/i3-utils-bin/master/bin/{{ item }}"
     dest: "/usr/local/bin/{{ item }}"
     mode: 0755
-    force: yes
+    force: True
     timeout: 30
   register: task_result
   until: task_result is succeeded
   retries: 10
   delay: 5
-  become: yes
+  become: True
   with_items:
     - "{{ i3_utils_bin_tools }}"
 
@@ -32,10 +32,10 @@
     url: https://raw.githubusercontent.com/cytopia/i3-utils-bin/master/applications/ximage.desktop
     dest: /usr/share/applications/ximage.desktop
     mode: 0644
-    force: yes
+    force: True
     timeout: 30
   register: task_result
   until: task_result is succeeded
   retries: 10
   delay: 5
-  become: yes
+  become: True
diff --git a/roles/i3-utils-bin/tasks/uninstall.yml b/roles/i3-utils-bin/tasks/uninstall.yml
index 225090f..81daba0 100644
--- a/roles/i3-utils-bin/tasks/uninstall.yml
+++ b/roles/i3-utils-bin/tasks/uninstall.yml
@@ -4,7 +4,7 @@
   file:
     state: absent
     path: "/usr/local/bin/{{ item }}"
-  become: yes
+  become: True
   with_items:
     - "{{ i3_utils_bin_tools }}"
 
@@ -12,4 +12,4 @@
   file:
     state: absent
     path: /usr/share/applications/ximage.desktop
-  become: yes
+  become: True
diff --git a/roles/i3-utils-systemd/tasks/install.yml b/roles/i3-utils-systemd/tasks/install.yml
index 99afb8b..a10ce09 100644
--- a/roles/i3-utils-systemd/tasks/install.yml
+++ b/roles/i3-utils-systemd/tasks/install.yml
@@ -11,20 +11,20 @@
     url: https://raw.githubusercontent.com/cytopia/i3-utils-bin/master/bin/xlock
     dest: /usr/local/bin/xlock
     mode: 0755
-    force: yes
+    force: True
     timeout: 30
   register: task_result
   until: task_result is succeeded
   retries: 10
   delay: 5
-  become: yes
+  become: True
 
 - name: ensure systemd directories exist
   file:
     state: directory
     path: "{{ item }}"
     mode: 0755
-  become: yes
+  become: True
   with_items:
     - "{{ i3_utils_systemd_systemd_base_path }}/system"
     - "{{ i3_utils_systemd_systemd_base_path }}/logind.conf.d"
@@ -34,13 +34,13 @@
     url: https://raw.githubusercontent.com/cytopia/i3-utils-systemd/master/systemd/logind.conf.d/70-close_lid.conf
     dest: "{{ i3_utils_systemd_systemd_base_path }}/logind.conf.d/70-close_lid.conf"
     mode: 0644
-    force: yes
+    force: True
     timeout: 30
   register: task_result
   until: task_result is succeeded
   retries: 10
   delay: 5
-  become: yes
+  become: True
 
 # suspend.service requires the current user to be set
 - name: create temporary file
@@ -48,7 +48,7 @@
     state: file
     suffix: temp
   changed_when: False
-  check_mode: no
+  check_mode: False
   register: i3_utils_systemd_tmp
 
 - name: ensure i3-utils-systemd suspend is downloaded
@@ -56,19 +56,19 @@
     url: https://github.com/cytopia/i3-utils-systemd/raw/master/systemd/system/suspend.service
     dest: "{{ i3_utils_systemd_tmp.path }}"
     mode: 0644
-    force: yes
+    force: True
     timeout: 30
   register: task_result
   until: task_result is succeeded
   retries: 10
   delay: 5
   changed_when: False
-  check_mode: no
+  check_mode: False
 
 - name: set username
   command: whoami
   register: i3_utils_systemd_username
-  check_mode: no
+  check_mode: False
   changed_when: False
 
 - name: ensure i3-utils-systemd suspend is using correct username
@@ -77,18 +77,18 @@
     regexp: '^User=REPLACE_ME$'
     line: "User={{ i3_utils_systemd_username.stdout }}"
   changed_when: False
-  check_mode: no
+  check_mode: False
 
 - name: ensure i3-utils-systemd suspend is in place
   copy:
     src: "{{ i3_utils_systemd_tmp.path }}"
     dest: "{{ i3_utils_systemd_systemd_base_path }}/system/suspend.service"
     mode: 0644
-  become: yes
+  become: True
 
 - name: ensure temp file is removed
   file:
     state: absent
     path: "{{ i3_utils_systemd_tmp.path }}"
   changed_when: False
-  check_mode: no
+  check_mode: False
diff --git a/roles/i3-utils-systemd/tasks/uninstall.yml b/roles/i3-utils-systemd/tasks/uninstall.yml
index f9267f5..5a0d52e 100644
--- a/roles/i3-utils-systemd/tasks/uninstall.yml
+++ b/roles/i3-utils-systemd/tasks/uninstall.yml
@@ -4,10 +4,10 @@
   file:
     state: absent
     path: "{{ i3_utils_systemd_systemd_base_path }}/logind.conf.d/70-close_lid.conf"
-  become: yes
+  become: True
 
 - name: ensure i3-utils-systemd suspend is removed
   file:
     state: absent
     path: "{{ i3_utils_systemd_systemd_base_path }}/system/suspend.service"
-  become: yes
+  become: True
diff --git a/roles/i3blocks-modules/tasks/install.yml b/roles/i3blocks-modules/tasks/install.yml
index b7634c4..1fed0fd 100644
--- a/roles/i3blocks-modules/tasks/install.yml
+++ b/roles/i3blocks-modules/tasks/install.yml
@@ -11,13 +11,13 @@
     state: directory
     path: "{{ i3blocks_modules_path }}"
     mode: 0755
-  check_mode: no
+  check_mode: False
 
 - name: ensure i3blocks-modules is cloned
   git:
     repo: https://github.com/cytopia/i3blocks-modules
-    clone: yes
+    clone: True
     dest: "{{ i3blocks_modules_path }}"
-    force: yes
-    update: yes
+    force: True
+    update: True
     depth: 1
diff --git a/roles/kops/tasks/install.yml b/roles/kops/tasks/install.yml
index 8a76ea5..9ce9627 100644
--- a/roles/kops/tasks/install.yml
+++ b/roles/kops/tasks/install.yml
@@ -10,10 +10,10 @@
   uri:
     url: "{{ kops_version_url }}"
     method: GET
-    follow_redirects: yes
-    return_content: yes
+    follow_redirects: True
+    return_content: True
   register: kops_info_raw
-  check_mode: no
+  check_mode: False
   until: kops_info_raw is succeeded
   retries: 10
   delay: 5
@@ -26,13 +26,13 @@
     url: "https://github.com/kubernetes/kops/releases/download/{{ kops_info_raw.json.tag_name }}/kops-linux-amd64"
     dest: "{{ kops_path }}/kops"
     mode: 0755
-    force: yes
+    force: True
     timeout: 30
   register: task_result
   until: task_result is succeeded
   retries: 10
   delay: 5
-  become: yes
+  become: True
 
 
 ###
@@ -49,4 +49,4 @@
     dest: "{{ kops_bash_completion_path }}/kops"
     mode: 0644
   changed_when: task_result.changed and task_result is succeeded
-  become: yes
+  become: True
diff --git a/roles/kops/tasks/uninstall.yml b/roles/kops/tasks/uninstall.yml
index 4d1cf41..70e994c 100644
--- a/roles/kops/tasks/uninstall.yml
+++ b/roles/kops/tasks/uninstall.yml
@@ -7,4 +7,4 @@
   with_items:
     - "{{ kops_path }}/kops"
     - "{{ kops_bash_completion_path }}/kops"
-  become: yes
+  become: True
diff --git a/roles/kubectl/tasks/install.yml b/roles/kubectl/tasks/install.yml
index a40fb5a..e70c4f8 100644
--- a/roles/kubectl/tasks/install.yml
+++ b/roles/kubectl/tasks/install.yml
@@ -10,10 +10,10 @@
   uri:
     url: "{{ kubectl_version_url }}"
     method: GET
-    follow_redirects: yes
-    return_content: yes
+    follow_redirects: True
+    return_content: True
   register: kubectl_info_raw
-  check_mode: no
+  check_mode: False
   until: kubectl_info_raw is succeeded
   retries: 10
   delay: 5
@@ -23,13 +23,13 @@
     url: "https://storage.googleapis.com/kubernetes-release/release/{{ kubectl_info_raw.content | trim }}/bin/linux/amd64/kubectl"
     dest: "{{ kubectl_path }}/kubectl"
     mode: 0755
-    force: yes
+    force: True
     timeout: 30
   register: task_result
   until: task_result is succeeded
   retries: 10
   delay: 5
-  become: yes
+  become: True
 
 
 ###
@@ -46,4 +46,4 @@
     dest: "{{ kubectl_bash_completion_path }}/kubectl"
     mode: 0644
   changed_when: task_result.changed and task_result is succeeded
-  become: yes
+  become: True
diff --git a/roles/kubectl/tasks/uninstall.yml b/roles/kubectl/tasks/uninstall.yml
index 4195821..9e2c49c 100644
--- a/roles/kubectl/tasks/uninstall.yml
+++ b/roles/kubectl/tasks/uninstall.yml
@@ -7,4 +7,4 @@
   with_items:
     - "{{ kubectl_path }}/kubectl"
     - "{{ kubectl_bash_completion_path }}/kubectl"
-  become: yes
+  become: True
diff --git a/roles/libreoffice/tasks/install.yml b/roles/libreoffice/tasks/install.yml
index c7902b7..b67e006 100644
--- a/roles/libreoffice/tasks/install.yml
+++ b/roles/libreoffice/tasks/install.yml
@@ -17,7 +17,7 @@
     owner: root
     group: root
     mode: 0644
-  become: yes
+  become: True
 
 - name: ensure config directory exists
   file:
diff --git a/roles/lxdm/defaults/main.yml b/roles/lxdm/defaults/main.yml
index ad759f5..d17c147 100644
--- a/roles/lxdm/defaults/main.yml
+++ b/roles/lxdm/defaults/main.yml
@@ -17,4 +17,4 @@ lxdm_theme: Industrial
 lxdm_gtk_theme: Clearlooks
 
 # Show users instead of having to type the username
-lxdm_show_user_list: yes
+lxdm_show_user_list: True
diff --git a/roles/lxdm/tasks/install.yml b/roles/lxdm/tasks/install.yml
index 8e2398a..5da39d6 100644
--- a/roles/lxdm/tasks/install.yml
+++ b/roles/lxdm/tasks/install.yml
@@ -13,4 +13,4 @@
     owner: root
     group: root
     mode: 0644
-  become: yes
+  become: True
diff --git a/roles/lxdm/tasks/uninstall.yml b/roles/lxdm/tasks/uninstall.yml
index 2fdfce5..3225d09 100644
--- a/roles/lxdm/tasks/uninstall.yml
+++ b/roles/lxdm/tasks/uninstall.yml
@@ -12,4 +12,4 @@
   file:
     state: absent
     path: /etc/lxdm/lxdm.conf
-  become: yes
+  become: True
diff --git a/roles/network-manager/defaults/main.yml b/roles/network-manager/defaults/main.yml
index 9e8969a..06eb6fe 100644
--- a/roles/network-manager/defaults/main.yml
+++ b/roles/network-manager/defaults/main.yml
@@ -3,12 +3,12 @@
 # 'install', 'remove' or 'ignore'
 network_manager: 'ignore'
 
-network_manager_plugin_openvpn: Yes
-network_manager_plugin_l2tp: No
-network_manager_plugin_openconnect: No
-network_manager_plugin_pptp: No
-network_manager_plugin_ssh: No
-network_manager_plugin_strongswan: No
-network_manager_plugin_vpnc: No
+network_manager_plugin_openvpn: True
+network_manager_plugin_l2tp: False
+network_manager_plugin_openconnect: False
+network_manager_plugin_pptp: False
+network_manager_plugin_ssh: False
+network_manager_plugin_strongswan: False
+network_manager_plugin_vpnc: False
 
-network_manager_nm_applet: Yes
+network_manager_nm_applet: True
diff --git a/roles/network-manager/tasks/install.yml b/roles/network-manager/tasks/install.yml
index 489b3fc..b1bb288 100644
--- a/roles/network-manager/tasks/install.yml
+++ b/roles/network-manager/tasks/install.yml
@@ -20,7 +20,7 @@
     owner: root
     group: root
     mode: 0644
-  become: yes
+  become: True
 
 
 ###
diff --git a/roles/oh-my-zsh/tasks/install.yml b/roles/oh-my-zsh/tasks/install.yml
index 562ca9a..b0c35f9 100644
--- a/roles/oh-my-zsh/tasks/install.yml
+++ b/roles/oh-my-zsh/tasks/install.yml
@@ -8,24 +8,24 @@
 
 - name: Clone oh-my-zsh repo
   git: repo=https://github.com/robbyrussell/oh-my-zsh.git dest=/root/.oh-my-zsh
-  become: yes
+  become: True
 
 - name: Create conf folder in home directory
   file: path=/root/conf/ state=directory owner=root
-  become: yes
+  become: True
 
 - name: deploy .zshrc
   template: src=../files/zshrc.in dest=/root/conf/zshrc owner=root
-  become: yes
+  become: True
 
 - name: remove standard zshrc
   file: path=/root/.zshrc state=absent
-  become: yes
+  become: True
 
 - name: symlink zshrc
   file: path=/root/.zshrc src=/root/conf/zshrc state=link owner=root force=true
-  become: yes
+  become: True
 
 - name: Set zsh as default shell
   user: name=root shell=/bin/zsh
-  become: yes
+  become: True
diff --git a/roles/oh-my-zsh/tasks/uninstall.yml b/roles/oh-my-zsh/tasks/uninstall.yml
index 6de79d2..2c050a2 100644
--- a/roles/oh-my-zsh/tasks/uninstall.yml
+++ b/roles/oh-my-zsh/tasks/uninstall.yml
@@ -2,7 +2,7 @@
 
 - name: reset bash as default shell
   user: name=root shell=/bin/bash
-  become: yes
+  become: True
 
 - name: ensure requirements are removed
   include_role:
@@ -13,16 +13,16 @@
 
 - name: remove zshrc and oh-my-zsh base path
   file: path=/root/.oh-my-zsh state=absent
-  become: yes
+  become: True
 
 - name: remove oh-my-zsh-conf path
   file: path=/root/conf state=absent
-  become: yes
+  become: True
 
 - name: remove oh-my-zsh-rc symlink
   file: path=/root/.zshrc state=absent
-  become: yes
+  become: True
 
 - name: remove oh-my-zsh-history file
   file: path=/root/.zsh_history state=absent
-  become: yes
+  become: True
diff --git a/roles/packer/tasks/install.yml b/roles/packer/tasks/install.yml
index 6d7ef05..91e17af 100644
--- a/roles/packer/tasks/install.yml
+++ b/roles/packer/tasks/install.yml
@@ -10,10 +10,10 @@
   uri:
     url: https://www.packer.io/downloads.html
     method: GET
-    follow_redirects: yes
-    return_content: yes
+    follow_redirects: True
+    return_content: True
   register: packer_info_raw
-  check_mode: no
+  check_mode: False
   until: packer_info_raw is succeeded
   retries: 10
   delay: 5
@@ -23,15 +23,15 @@
     packer_zip: "{{ packer_info_raw.content | regex_search(qry) }}"
   vars:
     qry: 'https://releases.*linux_amd64\.zip'
-  check_mode: no
+  check_mode: False
 
 - name: ensure packer is downloaded
   unarchive:
     src: "{{ packer_zip }}"
     dest: "{{ packer_path }}"
-    remote_src: yes
+    remote_src: True
     mode: 0755
-  become: yes
+  become: True
 
 
 ###
@@ -42,4 +42,4 @@
     src: bash-completion.j2
     dest: "{{ packer_bash_completion_path }}/packer"
     mode: 0644
-  become: yes
+  become: True
diff --git a/roles/packer/tasks/uninstall.yml b/roles/packer/tasks/uninstall.yml
index bf7c758..cd76941 100644
--- a/roles/packer/tasks/uninstall.yml
+++ b/roles/packer/tasks/uninstall.yml
@@ -7,4 +7,4 @@
   with_items:
     - "{{ packer_path }}/packer"
     - "{{ packer_bash_completion_path }}/packer"
-  become: yes
+  become: True
diff --git a/roles/pinta/tasks/install.yml b/roles/pinta/tasks/install.yml
index 643b535..9ef6ef3 100644
--- a/roles/pinta/tasks/install.yml
+++ b/roles/pinta/tasks/install.yml
@@ -4,7 +4,7 @@
   shell: apt-cache search pinta 2>/dev/null | grep -oE '^pinta\s'
   args:
     executable: /bin/bash
-  check_mode: no
+  check_mode: False
   changed_when: False
   failed_when: False
   register: pinta_repo_avail
diff --git a/roles/python-meta/defaults/main.yml b/roles/python-meta/defaults/main.yml
index 796e395..0c32215 100644
--- a/roles/python-meta/defaults/main.yml
+++ b/roles/python-meta/defaults/main.yml
@@ -1,8 +1,8 @@
 ---
 
 # Python versions to enable
-python_2: yes
-python_3: yes
+python_2: True
+python_3: True
 
 # Array of user-defined python[23] apt packaes
 python2_apt_packages: []
diff --git a/roles/python-meta/tasks/main.yml b/roles/python-meta/tasks/main.yml
index 51b34b4..c1a07ce 100644
--- a/roles/python-meta/tasks/main.yml
+++ b/roles/python-meta/tasks/main.yml
@@ -25,7 +25,7 @@
     state: latest
     name: "{{ python_2_required_pip_packages + pip2_packages }}"
     executable: pip2
-  become: yes
+  become: True
   when: python_2
 
 - name: ensure python3 pip packages are installed
@@ -33,5 +33,5 @@
     state: latest
     name: "{{ python_3_required_pip_packages + pip3_packages }}"
     executable: pip3
-  become: yes
+  become: True
   when: python_3
diff --git a/roles/sxiv/defaults/main.yml b/roles/sxiv/defaults/main.yml
index 77894d0..7a38686 100644
--- a/roles/sxiv/defaults/main.yml
+++ b/roles/sxiv/defaults/main.yml
@@ -3,7 +3,7 @@
 # 'install', 'remove' or 'ignore'
 sxiv: 'ignore'
 
-sxiv_default_image_viewer: yes
+sxiv_default_image_viewer: True
 
 # Mime types sxiv should be the default image editor
 sxiv_default_mime_types:
diff --git a/roles/sxiv/tasks/install.yml b/roles/sxiv/tasks/install.yml
index e097b50..844b725 100644
--- a/roles/sxiv/tasks/install.yml
+++ b/roles/sxiv/tasks/install.yml
@@ -11,13 +11,13 @@
     url: https://raw.githubusercontent.com/cytopia/i3-utils-bin/master/bin/ximage
     dest: "/usr/local/bin/{{ sxiv_wrapper_name }}"
     mode: 0755
-    force: yes
+    force: True
     timeout: 30
   register: task_result
   until: task_result is succeeded
   retries: 10
   delay: 5
-  become: yes
+  become: True
 
 - name: ensure applications directory exist
   file:
@@ -26,14 +26,14 @@
     mode: 0755
     owner: root
     group: root
-  become: yes
+  become: True
 
 - name: ensure sxiv desktop file is present
   template:
     src: usr/share/applications/sxiv.desktop.j2
     dest: /usr/share/applications/sxiv.desktop
     mode: 0644
-  become: yes
+  become: True
 
 - name: ensure sxiv default mime types are set
   include_role:
diff --git a/roles/sxiv/tasks/uninstall.yml b/roles/sxiv/tasks/uninstall.yml
index 9290b67..de84caa 100644
--- a/roles/sxiv/tasks/uninstall.yml
+++ b/roles/sxiv/tasks/uninstall.yml
@@ -11,4 +11,4 @@
   file:
     path: "/usr/local/bin/{{ sxiv_wrapper_name }}"
     state: absent
-  become: yes
+  become: True
diff --git a/roles/systemd-meta/tasks/systemd.yml b/roles/systemd-meta/tasks/systemd.yml
index 6962041..477a268 100644
--- a/roles/systemd-meta/tasks/systemd.yml
+++ b/roles/systemd-meta/tasks/systemd.yml
@@ -4,7 +4,7 @@
   shell: "systemctl list-unit-files --type=service | grep '^{{ systemd_item_name }}'"
   args:
     executable: /bin/bash
-  check_mode: no
+  check_mode: False
   changed_when: False
   failed_when: False
   register: systemd_service_available
@@ -15,5 +15,5 @@
     state: "{{ systemd_item_state }}"
     enabled: "{{ systemd_item_enabled }}"
     masked: "{{ systemd_item_masked }}"
-  become: Yes
+  become: True
   when: systemd_item_fail_on_error == True or systemd_service_available.rc == 0
diff --git a/roles/telegram/tasks/install.yml b/roles/telegram/tasks/install.yml
index 7e0d8d9..08f7f5f 100644
--- a/roles/telegram/tasks/install.yml
+++ b/roles/telegram/tasks/install.yml
@@ -11,15 +11,15 @@
     path: "{{ telegram_opt_path }}"
     state: directory
     mode: 0755
-  become: yes
+  become: True
 
 - name: ensure telegram is downloaded
   unarchive:
     src: "{{ telegram_download_url }}"
     dest: "{{ telegram_opt_path }}"
-    remote_src: yes
+    remote_src: True
     mode: 0755
-  become: yes
+  become: True
 
 - name: ensure telegram is symlinked to bin path
   file:
@@ -27,5 +27,5 @@
     src: "{{ telegram_opt_path }}/Telegram/Telegram"
     dest: "{{ telegram_bin_path }}/Telegram"
     owner: root
-  become: yes
+  become: True
 
diff --git a/roles/telegram/tasks/uninstall.yml b/roles/telegram/tasks/uninstall.yml
index 02caf0a..5b33511 100644
--- a/roles/telegram/tasks/uninstall.yml
+++ b/roles/telegram/tasks/uninstall.yml
@@ -4,10 +4,10 @@
   file:
     state: absent
     path: "{{ telegram_bin_path }}/Telegram"
-  become: yes
+  become: True
 
 - name: ensure telegram is removed
   file:
     state: absent
     path: "{{ telegram_opt_path }}/Telegram"
-  become: yes
+  become: True
diff --git a/roles/terraform/tasks/install.yml b/roles/terraform/tasks/install.yml
index f166264..52f2d85 100644
--- a/roles/terraform/tasks/install.yml
+++ b/roles/terraform/tasks/install.yml
@@ -10,10 +10,10 @@
   uri:
     url: https://www.terraform.io/downloads.html
     method: GET
-    follow_redirects: yes
-    return_content: yes
+    follow_redirects: True
+    return_content: True
   register: terraform_info_raw
-  check_mode: no
+  check_mode: False
   until: terraform_info_raw is succeeded
   retries: 10
   delay: 5
@@ -23,15 +23,15 @@
     terraform_zip: "{{ terraform_info_raw.content | regex_search(qry) }}"
   vars:
     qry: 'https://releases.*linux_amd64\.zip'
-  check_mode: no
+  check_mode: False
 
 - name: ensure terraform is downloaded
   unarchive:
     src: "{{ terraform_zip }}"
     dest: "{{ terraform_path }}"
-    remote_src: yes
+    remote_src: True
     mode: 0755
-  become: yes
+  become: True
 
 
 ###
@@ -42,4 +42,4 @@
     src: bash-completion.j2
     dest: "{{ terraform_bash_completion_path }}/terraform"
     mode: 0644
-  become: yes
+  become: True
diff --git a/roles/terraform/tasks/uninstall.yml b/roles/terraform/tasks/uninstall.yml
index 4814356..7a67051 100644
--- a/roles/terraform/tasks/uninstall.yml
+++ b/roles/terraform/tasks/uninstall.yml
@@ -7,4 +7,4 @@
   with_items:
     - "{{ terraform_path }}/terraform"
     - "{{ terraform_bash_completion_path }}/terraform"
-  become: yes
+  become: True
diff --git a/roles/thunar-custom-actions/tasks/install.yml b/roles/thunar-custom-actions/tasks/install.yml
index b47c87b..0981ebc 100644
--- a/roles/thunar-custom-actions/tasks/install.yml
+++ b/roles/thunar-custom-actions/tasks/install.yml
@@ -11,12 +11,12 @@
     url: "https://raw.githubusercontent.com/cytopia/thunar-custom-actions/master/{{ item }}"
     dest: "{{ thunar_custom_actions_bin_path }}/{{ item }}"
     mode: 0755
-    force: yes
+    force: True
     timeout: 30
   register: task_result
   until: task_result is succeeded
   retries: 10
   delay: 5
-  become: yes
+  become: True
   with_items:
     - "{{ thunar_custom_actions_tools }}"
diff --git a/roles/thunar-custom-actions/tasks/uninstall.yml b/roles/thunar-custom-actions/tasks/uninstall.yml
index 4e037bf..e32b7c8 100644
--- a/roles/thunar-custom-actions/tasks/uninstall.yml
+++ b/roles/thunar-custom-actions/tasks/uninstall.yml
@@ -4,6 +4,6 @@
   file:
     state: absent
     path: "{{ thunar_custom_actions_bin_path }}/{{ item }}"
-  become: yes
+  become: True
   with_items:
     - "{{ thunar_custom_actions_tools }}"
diff --git a/roles/thunar/defaults/main.yml b/roles/thunar/defaults/main.yml
index 53fc101..b54e9c8 100644
--- a/roles/thunar/defaults/main.yml
+++ b/roles/thunar/defaults/main.yml
@@ -4,5 +4,5 @@
 thunar: 'ignore'
 
 # Enable Thunar plugins
-thunar_volman_enable: yes
-thunar_archive_plugin_enable: yes
+thunar_volman_enable: True
+thunar_archive_plugin_enable: True
diff --git a/roles/thunderbird/tasks/fetch-xpi-uri-custom.yml b/roles/thunderbird/tasks/fetch-xpi-uri-custom.yml
index bb4c4ba..4dd4a8c 100644
--- a/roles/thunderbird/tasks/fetch-xpi-uri-custom.yml
+++ b/roles/thunderbird/tasks/fetch-xpi-uri-custom.yml
@@ -29,7 +29,7 @@
   args:
     chdir: "{{ thunderbird_ext_cust_temp_dir.path }}"
   check_mode: False
-  changed_when: No
+  changed_when: False
 
 - name: set xpi download url
   shell: grep -Eo 'http(s)?://.*\.xpi' page.txt | head -1
@@ -37,7 +37,7 @@
     chdir: "{{ thunderbird_ext_cust_temp_dir.path }}"
   register: thunderbird_ext_cust_xpi_url
   check_mode: False
-  changed_when: No
+  changed_when: False
 
 - name: ensure thunderbird remote xpi is installed
   include_tasks: install-ext-from-uri.yml
diff --git a/roles/thunderbird/tasks/fetch-xpi-uri-official.yml b/roles/thunderbird/tasks/fetch-xpi-uri-official.yml
index 828d9c2..995a02f 100644
--- a/roles/thunderbird/tasks/fetch-xpi-uri-official.yml
+++ b/roles/thunderbird/tasks/fetch-xpi-uri-official.yml
@@ -15,17 +15,17 @@
   uri:
     url: "{{ thunderbird_ext_url }}"
     method: GET
-    follow_redirects: yes
-    return_content: yes
+    follow_redirects: True
+    return_content: True
   register: thunderbird_ext_page_raw
-  check_mode: no
+  check_mode: False
 
 - name: set xpi download url
   set_fact:
     thunderbird_ext_xpi_url: "{{ thunderbird_ext_page_raw.content | regex_search(qry) }}"
   vars:
     qry: 'https://addons\.(.+?)/thunderbird/downloads/file/[0-9]+/(.+?)\.xpi'
-  check_mode: no
+  check_mode: False
 
 - name: ensure thunderbird remote xpi is installed
   include_tasks: install-ext-from-uri.yml
diff --git a/roles/thunderbird/tasks/install-ext-from-uri.yml b/roles/thunderbird/tasks/install-ext-from-uri.yml
index 25c3a32..5ebb40e 100644
--- a/roles/thunderbird/tasks/install-ext-from-uri.yml
+++ b/roles/thunderbird/tasks/install-ext-from-uri.yml
@@ -19,7 +19,7 @@
   unarchive:
     src: "{{ thunderbird_xpi_url }}"
     dest: "{{ thunderbird_temp_dir.path }}"
-    remote_src: yes
+    remote_src: True
   check_mode: False
   changed_when: False
 
@@ -29,7 +29,7 @@
     chdir: "{{ thunderbird_temp_dir.path }}"
   register: thunderbird_xpi_id
   check_mode: False
-  changed_when: No
+  changed_when: False
 
 - name: ensure thunderbird extension xpi id directory exist
   file:
@@ -42,7 +42,7 @@
   unarchive:
     src: "{{ thunderbird_xpi_url }}"
     dest: "{{ thunderbird_ext_dir }}/{{ thunderbird_xpi_id.stdout }}"
-    remote_src: yes
+    remote_src: True
   become: True
 
 - name: ensure temporary download directory is removed
diff --git a/roles/thunderbird/tasks/install.yml b/roles/thunderbird/tasks/install.yml
index 9602243..0c7843c 100644
--- a/roles/thunderbird/tasks/install.yml
+++ b/roles/thunderbird/tasks/install.yml
@@ -7,7 +7,7 @@
 - name: check if thunderbird is already installed
   command: "dpkg-query -s {{ thunderbird_package_name }}"
   register: thunderbird_installed
-  check_mode: no
+  check_mode: False
   failed_when: thunderbird_installed.rc > 1
   changed_when: thunderbird_installed.rc == 1
 
diff --git a/roles/thunderbird/tasks/uninstall.yml b/roles/thunderbird/tasks/uninstall.yml
index 3f2420d..a670f94 100644
--- a/roles/thunderbird/tasks/uninstall.yml
+++ b/roles/thunderbird/tasks/uninstall.yml
@@ -11,4 +11,4 @@
   file:
     state: absent
     path: "{{ thunderbird_ext_dir }}"
-  become: Yes
+  become: True
diff --git a/roles/timemachine/tasks/install.yml b/roles/timemachine/tasks/install.yml
index e859c47..f79db13 100644
--- a/roles/timemachine/tasks/install.yml
+++ b/roles/timemachine/tasks/install.yml
@@ -11,10 +11,10 @@
     url: https://raw.githubusercontent.com/cytopia/linux-timemachine/master/timemachine
     dest: "{{ timemachine_path }}"
     mode: 0755
-    force: yes
+    force: True
     timeout: 30
   register: task_result
   until: task_result is succeeded
   retries: 10
   delay: 5
-  become: yes
+  become: True
diff --git a/roles/timemachine/tasks/uninstall.yml b/roles/timemachine/tasks/uninstall.yml
index c2d2132..38ee426 100644
--- a/roles/timemachine/tasks/uninstall.yml
+++ b/roles/timemachine/tasks/uninstall.yml
@@ -4,4 +4,4 @@
   file:
     state: absent
     path: "{{ timemachine_path }}"
-  become: yes
+  become: True
diff --git a/roles/urxvt/tasks/install.yml b/roles/urxvt/tasks/install.yml
index 2810064..9ce6d4b 100644
--- a/roles/urxvt/tasks/install.yml
+++ b/roles/urxvt/tasks/install.yml
@@ -13,19 +13,19 @@
     mode: 0755
     owner: root
     group: root
-  become: yes
+  become: True
 
 - name: ensure urxvt extensions are downloaded
   get_url:
     url: "{{ item }}"
     dest: "{{ urxvt_extensions_path }}/{{ item | basename }}"
     mode: 0755
-    force: yes
+    force: True
     timeout: 30
   register: task_result
   until: task_result is succeeded
   retries: 10
   delay: 5
-  become: yes
+  become: True
   with_items:
     - "{{ urxvt_extensions }}"
diff --git a/roles/urxvt/tasks/uninstall.yml b/roles/urxvt/tasks/uninstall.yml
index 6fade9a..5628bb6 100644
--- a/roles/urxvt/tasks/uninstall.yml
+++ b/roles/urxvt/tasks/uninstall.yml
@@ -12,4 +12,4 @@
   file:
     state: absent
     path: "{{ urxvt_extensions_path }}"
-  become: yes
+  become: True
diff --git a/roles/virtualbox/tasks/install.yml b/roles/virtualbox/tasks/install.yml
index 70970df..f7be10f 100644
--- a/roles/virtualbox/tasks/install.yml
+++ b/roles/virtualbox/tasks/install.yml
@@ -9,13 +9,13 @@
 - name: set username
   command: whoami
   register: virtualbox_username
-  check_mode: no
+  check_mode: False
   changed_when: False
 
 - name: ensure user is added to vboxusers group
   user:
     name: "{{ virtualbox_username.stdout }}"
     groups: vboxusers
-    append: yes
+    append: True
     update_password: on_create
-  become: yes
+  become: True
diff --git a/roles/xbacklight/tasks/install.yml b/roles/xbacklight/tasks/install.yml
index 5164597..6425660 100644
--- a/roles/xbacklight/tasks/install.yml
+++ b/roles/xbacklight/tasks/install.yml
@@ -13,13 +13,13 @@
     url: https://raw.githubusercontent.com/wavexx/acpilight/master/xbacklight
     dest: "{{ xbacklight_path }}"
     mode: 0755
-    force: yes
+    force: True
     timeout: 30
   register: task_result
   until: task_result is succeeded
   retries: 10
   delay: 5
-  become: yes
+  become: True
 
 - name: ensure udev is installed
   include_role:
@@ -35,7 +35,7 @@
     owner: root
     group: root
     mode: 0755
-  become: yes
+  become: True
 
 - name: ensure udev rules are present
   copy:
@@ -44,18 +44,18 @@
     owner: root
     group: root
     mode: 0644
-  become: yes
+  become: True
 
 - name: set username
   command: whoami
   register: xbacklight_username
-  check_mode: no
+  check_mode: False
   changed_when: False
 
 - name: ensure user is added to video group
   user:
     name: "{{ xbacklight_username.stdout }}"
     groups: video
-    append: yes
+    append: True
     update_password: on_create
-  become: yes
+  become: True
diff --git a/roles/xbacklight/tasks/uninstall.yml b/roles/xbacklight/tasks/uninstall.yml
index a40eca6..5135ffe 100644
--- a/roles/xbacklight/tasks/uninstall.yml
+++ b/roles/xbacklight/tasks/uninstall.yml
@@ -4,10 +4,10 @@
   file:
     state: absent
     path: "{{ xbacklight_path }}"
-  become: yes
+  become: True
 
 - name: ensure udev rules are removed
   file:
     state: absent
     path: "{{ xbacklight_udev_rules_dir }}/90-backlight.rules"
-  become: yes
+  become: True
diff --git a/roles/xorg/defaults/main.yml b/roles/xorg/defaults/main.yml
index 61168df..f22835f 100644
--- a/roles/xorg/defaults/main.yml
+++ b/roles/xorg/defaults/main.yml
@@ -15,7 +15,7 @@ xorg_gpu: modesetting
 xorg_gpu_accel_method: glamor
 
 # Enable VDPAU_DRIVER=va_gl systemwide
-xorg_gpu_vdpau_va_gl_enable: yes
+xorg_gpu_vdpau_va_gl_enable: True
 
 
 ###
@@ -23,5 +23,5 @@ xorg_gpu_vdpau_va_gl_enable: yes
 ###
 
 # 'libinput' or 'synaptics'
-xorg_touchpad_enable: yes
+xorg_touchpad_enable: True
 xorg_touchpad_driver: 'synaptics'
diff --git a/roles/xorg/tasks/install.yml b/roles/xorg/tasks/install.yml
index 3d2c8af..1aba694 100644
--- a/roles/xorg/tasks/install.yml
+++ b/roles/xorg/tasks/install.yml
@@ -16,7 +16,7 @@
     mode: 0755
     owner: root
     group: root
-  become: yes
+  become: True
 
 
 ###
@@ -40,7 +40,7 @@
   register: reg_xorg_tentative_packages
   with_items:
     - "{{ xorg_gpu_vaapi_tentative_packages }}"
-  check_mode: no
+  check_mode: False
   changed_when: False
 
 - name: ensure tentative gpu vaapi packages are installed
@@ -57,7 +57,7 @@
     owner: root
     group: root
     mode: 0644
-  become: yes
+  become: True
 
 - name: ensure xorg gpu VDPAU_DRIVER va_gl session config is present
   template:
@@ -66,7 +66,7 @@
     owner: root
     group: root
     mode: 0644
-  become: yes
+  become: True
 
 
 ###
@@ -79,7 +79,7 @@
     owner: root
     group: root
     mode: 0644
-  become: yes
+  become: True
 
 
 ###
@@ -109,7 +109,7 @@
     owner: root
     group: root
     mode: 0644
-  become: yes
+  become: True
   when: xorg_touchpad_enable == True
 
 
@@ -139,6 +139,6 @@
   file:
     state: absent
     path: "{{ item }}"
-  become: yes
+  become: True
   with_items:
     - "{{ xorg_remove_config_files_abs }}"
diff --git a/roles/xorg/tasks/uninstall.yml b/roles/xorg/tasks/uninstall.yml
index 90954b5..95f8a9b 100644
--- a/roles/xorg/tasks/uninstall.yml
+++ b/roles/xorg/tasks/uninstall.yml
@@ -22,7 +22,7 @@
   file:
     state: absent
     path: "{{ item }}"
-  become: yes
+  become: True
   with_items:
     - "{{ xorg_config_dir }}/{{ xorg_config_gpu }}"
     - "{{ xorg_config_dir }}/{{ xorg_config_keyboard }}"