diff --git a/dev-requirements.txt b/dev-requirements.txt
index 1ba9787..d9e4801 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,3 +1,3 @@
 -r requirements.txt
-yamllint==1.18.0
+yamllint==1.22.1
 ansible-lint==4.2.0
diff --git a/tasks/applications.yml b/tasks/applications.yml
index 9b16fe1..e12391f 100644
--- a/tasks/applications.yml
+++ b/tasks/applications.yml
@@ -1,41 +1,41 @@
-- name: "Install Virtualbox dependencies"
+- name: Install Virtualbox dependencies
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
-    - 'virtualbox-host-modules-arch'
+    - virtualbox-host-modules-arch
 
-- name: "Install general applications"
+- name: Install general applications
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
-    - 'bleachbit'
-    - 'clamtk'
-    - 'filezilla'
-    - 'firefox'
-    - 'gimp'
-    - 'ghostwriter'
-    - 'glogg'
-    - 'gparted'
-    - 'hplip'
-    - 'inkscape'
-    - 'kdenlive'
-    - 'kodi'
+    - bleachbit
+    - clamtk
+    - filezilla
+    - firefox
+    - gimp
+    - ghostwriter
+    - glogg
+    - gparted
+    - hplip
+    - inkscape
+    - kdenlive
+    - kodi
     - libreoffice-fresh
     - libreoffice-fresh-en-gb
-    - 'minecraft'
-    - 'obs-studio'
-    - 'slack-desktop'
-    - 'steam'
-    - 'thunderbird'
-    - 'tor-browser'
-    - 'virtualbox'
-    - 'vlc'
-    - 'xsane'
+    - minecraft
+    - obs-studio
+    - slack-desktop
+    - steam
+    - thunderbird
+    - tor-browser
+    - virtualbox
+    - vlc
+    - xsane
diff --git a/tasks/autostart.yml b/tasks/autostart.yml
index ffad770..4f4976f 100644
--- a/tasks/autostart.yml
+++ b/tasks/autostart.yml
@@ -1,43 +1,43 @@
-- name: "Install autostart-related packages"
+- name: Install autostart-related packages
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
-    - 'dex'
+    - dex
 
-- name: "Create autostart directory"
+- name: Create autostart directory
   file:
-    path: '{{ home }}/.config/autostart'
+    path: "{{ home }}/.config/autostart"
     state: directory
     owner: "{{ user }}"
     mode: 0755
 
-- name: "Autostart services"
+- name: Autostart services
   file:
-    src: "/etc/xdg/autostart/{{ item }}.desktop"
+    src: /etc/xdg/autostart/{{ item }}.desktop
     dest: "{{ home }}/.config/autostart/{{ item }}.desktop"
     mode: 0644
     owner: "{{ user }}"
     state: link
     force: true
   loop:
-    - 'blueman'
-    - 'pulseaudio'
-    - 'nm-applet'
-    - 'lxqt-policykit-agent'
-    - 'solaar'
+    - blueman
+    - pulseaudio
+    - nm-applet
+    - lxqt-policykit-agent
+    - solaar
 
-- name: "Autostart applications"
+- name: Autostart applications
   file:
-    src: "/usr/share/applications/{{ item }}.desktop"
+    src: /usr/share/applications/{{ item }}.desktop
     dest: "{{ home }}/.config/autostart/{{ item }}.desktop"
     mode: 0644
     owner: "{{ user }}"
     state: link
     force: true
   loop:
-    - 'flameshot'
-    - 'libinput-gestures'
+    - flameshot
+    - libinput-gestures
diff --git a/tasks/boot.yml b/tasks/boot.yml
index e967bb8..3103ba4 100644
--- a/tasks/boot.yml
+++ b/tasks/boot.yml
@@ -1,23 +1,23 @@
-- name: "Install Grub"
+- name: Install Grub
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
-    - 'grub-customizer'
-    - 'grub2-theme-archlinux'
-    - 'lightdm'
-    - 'lightdm-gtk-greeter'
-    - 'os-prober'
+    - grub-customizer
+    - grub2-theme-archlinux
+    - lightdm
+    - lightdm-gtk-greeter
+    - os-prober
 
-- name: "Enable lightdm"
+- name: Enable lightdm
   systemd:
-    name: "lightdm"
+    name: lightdm
     enabled: true
 
-- name: "Disable PC Speaker"
+- name: Disable PC Speaker
   modprobe:
     name: pcspkr
     state: absent
@@ -26,7 +26,7 @@
 - name: Enable Slick greeter for lightdm
   ini_file:
     path: /etc/lightdm/lightdm.conf
-    section: "Seat:*"
+    section: Seat:*
     option: greeter-session
     value: lightdm-gtk-greeter
     mode: 0644
@@ -34,39 +34,39 @@
 - name: Set LightDM settings
   ini_file:
     path: /etc/lightdm/lightdm-gtk-greeter.conf
-    section: "greeter"
+    section: greeter
     option: "{{ item.key }}"
     value: "{{ item.value }}"
     mode: 0644
   loop_control:
     label: "{{ item.key }}"
   loop:
-    - {key: "background", value: "/usr/share/backgrounds/gnome/adwaita-night.jpg"}
-    - {key: "theme-name", value: "Matcha-dark-aliz"}
-    - {key: "icon-theme-name", value: "Numix-Square"}
-    - {key: "hide-user-image", value: "true"}
-    - {key: "clock-format", value: "%H:%M:%S"}
+    - {key: background, value: /usr/share/backgrounds/gnome/adwaita-night.jpg}
+    - {key: theme-name, value: Matcha-dark-aliz}
+    - {key: icon-theme-name, value: Numix-Square}
+    - {key: hide-user-image, value: "true"}
+    - {key: clock-format, value: "%H:%M:%S"}
 
-- name: "Install file system helpers"
+- name: Install file system helpers
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
     - dosfstools
     - exfat-utils
     - hfsprogs
     - ntfs-3g
 
-- name: "Install Microcode"
+- name: Install Microcode
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
-    - 'amd-ucode'
-    - 'intel-ucode'
+    - amd-ucode
+    - intel-ucode
diff --git a/tasks/cleanup.yml b/tasks/cleanup.yml
index f72f8fa..7284582 100644
--- a/tasks/cleanup.yml
+++ b/tasks/cleanup.yml
@@ -1,4 +1,4 @@
-- name: "Remove aur_builder user"
+- name: Remove aur_builder user
   user:
     name: aur_builder
     state: absent
diff --git a/tasks/dabapps.yml b/tasks/dabapps.yml
index 4a64777..53c13a3 100644
--- a/tasks/dabapps.yml
+++ b/tasks/dabapps.yml
@@ -1,17 +1,17 @@
-- name: "Install DabApps packages"
+- name: Install DabApps packages
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
-    - 'heroku-cli'
-    - 'mercurial'
-    - 'ngrok'
-    - 'python-aws-mfa'
+    - heroku-cli
+    - mercurial
+    - ngrok
+    - python-aws-mfa
 
-- name: "Clone DabApps Dotfiles"
+- name: Clone DabApps Dotfiles
   git:
     repo: git@github.com:dabapps/dotfiles
     dest: "{{ home }}/Projects/dotfiles"
@@ -19,7 +19,7 @@
   become: true
   become_user: "{{ user }}"
 
-- name: "Install DabApps EditorConfig"
+- name: Install DabApps EditorConfig
   file:
     src: "{{ home }}/Projects/dotfiles/.editorconfig"
     dest: "{{ home }}/Projects/.editorconfig"
@@ -31,7 +31,7 @@
 - name: Enable strip mercurial extension
   ini_file:
     path: "{{ home }}/.hgrc"
-    section: "extensions"
+    section: extensions
     option: strip
     value: ""
     mode: 0644
@@ -39,7 +39,7 @@
 - name: Enable strip mercurial extension
   ini_file:
     path: "{{ home }}/.hgrc"
-    section: "ui"
+    section: ui
     option: ignore
-    value: '{{ home }}/.config/.gitignore'
+    value: "{{ home }}/.config/.gitignore"
     mode: 0644
diff --git a/tasks/dev.yml b/tasks/dev.yml
index 1a20f85..819c517 100644
--- a/tasks/dev.yml
+++ b/tasks/dev.yml
@@ -1,45 +1,45 @@
-- name: "Install LaTex tooling"
+- name: Install LaTex tooling
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
-    - 'biber'
-    - 'pandoc-bin'
-    - 'texlive-most'
+    - biber
+    - pandoc-bin
+    - texlive-most
 
-- name: "Install dev packages"
+- name: Install dev packages
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
-    - 'arduino'
-    - 'arduino-cli'
-    - 'arduino-builder'
-    - 'aws-cli'
-    - 'docker'
-    - 'docker-compose'
-    - 'firefox-developer-edition'
-    - 'hugo'
-    - 'poetry'
-    - 'postgresql'
-    - 'postman-bin'
-    - 'sublime-text'
-    - 'tig'
+    - arduino
+    - arduino-cli
+    - arduino-builder
+    - aws-cli
+    - docker
+    - docker-compose
+    - firefox-developer-edition
+    - hugo
+    - poetry
+    - postgresql
+    - postman-bin
+    - sublime-text
+    - tig
 
-- name: "Create global .gitignore"
+- name: Create global .gitignore
   copy:
-    src: './files/gitignore_global'
-    dest: '{{ home }}/.config/.gitignore'
+    src: ./files/gitignore_global
+    dest: "{{ home }}/.config/.gitignore"
     mode: 0644
     owner: "{{ user }}"
 
-- name: "Install git config"
+- name: Install git config
   template:
     src: ./files/gitconfig.conf
     dest: "{{ home }}/.gitconfig"
diff --git a/tasks/fonts.yml b/tasks/fonts.yml
index 03e71f0..fd93628 100644
--- a/tasks/fonts.yml
+++ b/tasks/fonts.yml
@@ -1,27 +1,27 @@
-- name: "Install font packages"
+- name: Install font packages
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
-    - 'all-repository-fonts'
-    - 'fonts-meta-extended-lt'
-    - 'otf-fira-code'
-    - 'otf-font-awesome'
-    - 'ttf-fira-code'
-    - 'ttf-font-awesome'
-    - 'ttf-ms-fonts'
-    - 'ttf-wps-fonts'
+    - all-repository-fonts
+    - fonts-meta-extended-lt
+    - otf-fira-code
+    - otf-font-awesome
+    - ttf-fira-code
+    - ttf-font-awesome
+    - ttf-ms-fonts
+    - ttf-wps-fonts
 
 - name: Install font configurations
   file:
-    src: "/etc/fonts/conf.avail/{{ item }}"
-    dest: "/etc/fonts/conf.d/{{ item }}"
+    src: /etc/fonts/conf.avail/{{ item }}
+    dest: /etc/fonts/conf.d/{{ item }}
     mode: 0644
     state: link
   loop:
-    - '11-lcdfilter-default.conf'
-    - '10-sub-pixel-rgb.conf'
-    - '30-infinality-aliases.conf'
+    - 11-lcdfilter-default.conf
+    - 10-sub-pixel-rgb.conf
+    - 30-infinality-aliases.conf
diff --git a/tasks/gnome.yml b/tasks/gnome.yml
index 298a363..96c0c3e 100644
--- a/tasks/gnome.yml
+++ b/tasks/gnome.yml
@@ -1,4 +1,4 @@
-- name: "Add nautilus file templates"
+- name: Add nautilus file templates
   copy:
     src: ./files/Templates
     dest: "{{ home }}"
@@ -7,13 +7,13 @@
     group: users
     directory_mode: 0755
 
-- name: "Install Gnome packages"
+- name: Install Gnome packages
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
     - baobab
     - cheese
@@ -30,67 +30,67 @@
     - gnome-usage
     - nautilus
 
-- name: "Install GTK tools"
+- name: Install GTK tools
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
-    - 'gtk-engine-murrine'
-    - 'lxappearance'
-    - 'numix-gtk-theme-git'
-    - 'matcha-gtk-theme'
-    - 'numix-square-icon-theme'
-    - 'qt5-styleplugins'
+    - gtk-engine-murrine
+    - lxappearance
+    - numix-gtk-theme-git
+    - matcha-gtk-theme
+    - numix-square-icon-theme
+    - qt5-styleplugins
 
 - name: Set GTK theme
   dconf:
-    key: "/org/gnome/desktop/interface/gtk-theme"
-    value: '"Matcha-dark-aliz"'
+    key: /org/gnome/desktop/interface/gtk-theme
+    value: Matcha-dark-aliz
   become: true
   become_user: "{{ user }}"
 
 - name: Set GTK icon theme
   dconf:
-    key: "/org/gnome/desktop/interface/icon-theme"
-    value: '"Numix-Square"'
+    key: /org/gnome/desktop/interface/icon-theme
+    value: Numix-Square
   become: true
   become_user: "{{ user }}"
 
-- name: "Install GTK2 config"
+- name: Install GTK2 config
   copy:
-    src: './files/gtkrc-2.0'
-    dest: '{{ home }}/.gtkrc-2.0'
+    src: ./files/gtkrc-2.0
+    dest: "{{ home }}/.gtkrc-2.0"
     mode: 0644
     owner: "{{ user }}"
 
-- name: "Create GTK3 config directory"
+- name: Create GTK3 config directory
   file:
-    path: '{{ home }}/.config/gtk-3.0/'
+    path: "{{ home }}/.config/gtk-3.0/"
     state: directory
     owner: "{{ user }}"
     mode: 0755
 
 
-- name: "Install GTK3 config"
+- name: Install GTK3 config
   copy:
-    src: './files/gtk3-settings.ini'
-    dest: '{{ home }}/.config/gtk-3.0/settings.ini'
+    src: ./files/gtk3-settings.ini
+    dest: "{{ home }}/.config/gtk-3.0/settings.ini"
     mode: 0644
     owner: "{{ user }}"
 
-- name: "Autostart gnome-settings services"
+- name: Autostart gnome-settings services
   file:
-    src: "/etc/xdg/autostart/{{ item }}.desktop"
+    src: /etc/xdg/autostart/{{ item }}.desktop
     dest: "{{ home }}/.config/autostart/{{ item }}.desktop"
     mode: 0644
     owner: "{{ user }}"
     state: link
     force: true
   loop:
-    - 'org.gnome.SettingsDaemon.XSettings'
-    - 'org.gnome.SettingsDaemon.DiskUtilityNotify'
-    - 'org.gnome.SettingsDaemon.Keyboard'
-    - 'gsettings-data-convert'
+    - org.gnome.SettingsDaemon.XSettings
+    - org.gnome.SettingsDaemon.DiskUtilityNotify
+    - org.gnome.SettingsDaemon.Keyboard
+    - gsettings-data-convert
diff --git a/tasks/i3.yml b/tasks/i3.yml
index 179584f..50f4df1 100644
--- a/tasks/i3.yml
+++ b/tasks/i3.yml
@@ -1,29 +1,29 @@
-- name: "Install i3 packages"
+- name: Install i3 packages
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
-    - 'arandr'
-    - 'betterlockscreen'
-    - 'brightnessctl'
-    - 'picom'
-    - 'dmenu'
-    - 'dunst'
-    - 'feh'
-    - 'flameshot'
-    - 'i3-gaps'
-    - 'i3lock-color'
-    - 'lxrandr'
-    - 'lxqt-policykit'
-    - 'aur/polybar'
-    - 'redshift'
-    - 'rofi'
-    - 'rofi-calc'
-    - 'tbg'
-    - 'xdotool'
+    - arandr
+    - betterlockscreen
+    - brightnessctl
+    - picom
+    - dmenu
+    - dunst
+    - feh
+    - flameshot
+    - i3-gaps
+    - i3lock-color
+    - lxrandr
+    - lxqt-policykit
+    - aur/polybar
+    - redshift
+    - rofi
+    - rofi-calc
+    - tbg
+    - xdotool
     - xorg
 
 
@@ -31,42 +31,42 @@
   set_fact:
     polybar_scripts: "{{ home }}/.config/polybar/polybar-scripts/polybar-scripts"
     i3_config_files:
-      - {src: "i3.conf", dest: "{{ home }}/.config/i3/config"}
-      - {src: "i3status.conf", dest: "{{ home }}/.config/i3status/config"}
-      - {src: "picom.conf", dest: "{{ home }}/.config/picom.conf"}
-      - {src: "dunst.conf", dest: "{{ home }}/.config/dunst/dunstrc"}
-      - {src: "polybar.ini", dest: "{{ home }}/.config/polybar/config"}
+      - {src: i3.conf, dest: "{{ home }}/.config/i3/config"}
+      - {src: i3status.conf, dest: "{{ home }}/.config/i3status/config"}
+      - {src: picom.conf, dest: "{{ home }}/.config/picom.conf"}
+      - {src: dunst.conf, dest: "{{ home }}/.config/dunst/dunstrc"}
+      - {src: polybar.ini, dest: "{{ home }}/.config/polybar/config"}
 
-- name: "Create i3 config file directories"
+- name: Create i3 config file directories
   loop: "{{ i3_config_files }}"
   loop_control:
     label: "{{ item.src }}"
   file:
-    path: '{{ item.dest | dirname }}'
+    path: "{{ item.dest | dirname }}"
     state: directory
     owner: "{{ user }}"
     mode: 0755
 
-- name: "i3 config files"
+- name: i3 config files
   loop: "{{ i3_config_files }}"
   loop_control:
     label: "{{ item.src }}"
   template:
-    src: './files/{{ item.src }}'
-    dest: '{{ item.dest }}'
+    src: ./files/{{ item.src }}
+    dest: "{{ item.dest }}"
     mode: 0644
     owner: "{{ user }}"
 
 
-- name: "Create polybar config directory"
+- name: Create polybar config directory
   file:
-    path: '{{ home }}/.config/polybar/'
+    path: "{{ home }}/.config/polybar/"
     state: directory
     owner: "{{ user }}"
     mode: 0755
 
 
-- name: "Polybar scripts"
+- name: Polybar scripts
   git:
     repo: https://github.com/x70b1/polybar-scripts
     dest: "{{ home }}/.config/polybar/polybar-scripts"
@@ -83,17 +83,17 @@
     group: users
 
 
-- name: "Create rofi config directory"
+- name: Create rofi config directory
   file:
-    path: '{{ home }}/.config/rofi/'
+    path: "{{ home }}/.config/rofi/"
     state: directory
     owner: "{{ user }}"
     mode: 0755
 
-- name: "Create rofi config"
+- name: Create rofi config
   copy:
-    src: './files/rofi.conf'
-    dest: '{{ home }}/.config/rofi/config'
+    src: ./files/rofi.conf
+    dest: "{{ home }}/.config/rofi/config"
     mode: 0644
     owner: "{{ user }}"
 
diff --git a/tasks/input.yml b/tasks/input.yml
index aa1a9f0..f4136b9 100644
--- a/tasks/input.yml
+++ b/tasks/input.yml
@@ -1,18 +1,18 @@
-- name: "Install input packages"
+- name: Install input packages
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
-    - 'gpointing-device-settings'
-    - 'ibus'
-    - 'ibus-uniemoji'
-    - 'libinput'
-    - 'libinput-gestures'
-    - 'solaar'
-    - 'xorg-xev'
+    - gpointing-device-settings
+    - ibus
+    - ibus-uniemoji
+    - libinput
+    - libinput-gestures
+    - solaar
+    - xorg-xev
 
 - name: Install mouse config
   copy:
@@ -35,17 +35,17 @@
     mode: 0644
     owner: "{{ user }}"
 
-- name: "Create uniemoji config directory"
+- name: Create uniemoji config directory
   file:
-    path: '{{ home }}/.config/uniemoji/'
+    path: "{{ home }}/.config/uniemoji/"
     state: directory
     owner: "{{ user }}"
     mode: 0755
 
-- name: "Create uniemoji config"
+- name: Create uniemoji config
   copy:
-    src: './files/uniemoji.json'
-    dest: '{{ home }}/.config/uniemoji/custom.json'
+    src: ./files/uniemoji.json
+    dest: "{{ home }}/.config/uniemoji/custom.json"
     mode: 0644
     owner: "{{ user }}"
 
diff --git a/tasks/intersect.yml b/tasks/intersect.yml
index da24021..ea1508a 100644
--- a/tasks/intersect.yml
+++ b/tasks/intersect.yml
@@ -1,19 +1,19 @@
-- name: "Install intersect packages"
+- name: Install intersect packages
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
-    - 'calibre'
-    - 'deluge'
-    - 'feedreader'
-    - 'nextcloud-client'
-    - "quassel-client"
+    - calibre
+    - deluge
+    - feedreader
+    - nextcloud-client
+    - quassel-client
     - terraform
     - terraform-lsp-bin
-    - 'turtl'
+    - turtl
 
 
 - name: Create dotfiles directory
diff --git a/tasks/javascript.yml b/tasks/javascript.yml
index 7e53994..823f1aa 100644
--- a/tasks/javascript.yml
+++ b/tasks/javascript.yml
@@ -1,10 +1,10 @@
-- name: "Install Javascript packages"
+- name: Install Javascript packages
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
-    - 'nodejs'
-    - 'nvm'
+    - nodejs
+    - nvm
diff --git a/tasks/mac.yml b/tasks/mac.yml
index fe1497b..fd13a8f 100644
--- a/tasks/mac.yml
+++ b/tasks/mac.yml
@@ -1,10 +1,10 @@
-- name: "Install macOS packages"
+- name: Install macOS packages
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
     - mbpfan-git
     - bcwc-pcie-git
@@ -19,5 +19,5 @@
   lineinfile:
     path: /etc/systemd/logind.conf
     state: present
-    regexp: '^HandlePowerKey='
-    line: 'HandlePowerKey=ignore'
+    regexp: ^HandlePowerKey=
+    line: HandlePowerKey=ignore
diff --git a/tasks/media.yml b/tasks/media.yml
index a38fb43..620f315 100644
--- a/tasks/media.yml
+++ b/tasks/media.yml
@@ -1,35 +1,35 @@
-- name: "Install Spotify"
+- name: Install Spotify
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
-    - 'ffmpeg-compat-57'
-    - 'spotify'
+    - ffmpeg-compat-57
+    - spotify
 
-- name: "Install media-related packages"
+- name: Install media-related packages
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
-    - 'bcm20702a1-firmware'
-    - 'bluez-firmware'
-    - 'bluez-utils-compat'
-    - 'blueman'
-    - 'handbrake'
+    - bcm20702a1-firmware
+    - bluez-firmware
+    - bluez-utils-compat
+    - blueman
+    - handbrake
 
-- name: "Install pulseaudio"
+- name: Install pulseaudio
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
     - alsa-utils
     - pavucontrol
diff --git a/tasks/network.yml b/tasks/network.yml
index bbf0fbd..18e13d6 100644
--- a/tasks/network.yml
+++ b/tasks/network.yml
@@ -1,28 +1,28 @@
-- name: "Install networking tools"
+- name: Install networking tools
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
-    - 'bind-tools'
-    - 'gnu-netcat'
-    - 'nmap'
+    - bind-tools
+    - gnu-netcat
+    - nmap
 
-- name: "Install NetworkManager and associated tools"
+- name: Install NetworkManager and associated tools
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
-    - 'networkmanager'
-    - 'network-manager-applet'
+    - networkmanager
+    - network-manager-applet
 
-- name: "Enable NetworkManger"
+- name: Enable NetworkManger
   systemd:
-    name: "NetworkManager"
+    name: NetworkManager
     enabled: true
     state: started
diff --git a/tasks/ntp.yml b/tasks/ntp.yml
index 9eed1c0..7db023f 100644
--- a/tasks/ntp.yml
+++ b/tasks/ntp.yml
@@ -1,10 +1,10 @@
-- name: "Install NTP"
+- name: Install NTP
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
     - ntp
 
@@ -14,6 +14,6 @@
 
 - name: Enable NTP service
   systemd:
-    name: "ntpd"
+    name: ntpd
     enabled: true
     state: started
diff --git a/tasks/packages.yml b/tasks/packages.yml
index 464febd..ff6b760 100644
--- a/tasks/packages.yml
+++ b/tasks/packages.yml
@@ -1,8 +1,8 @@
 - name: Define keys for pacman
   set_fact:
     keys:
-      - '1EDDE2CDFC025D17F6DA9EC0ADAE6AD28A8F901A'  # Sublime Text
-      - '9D5F1C051D146843CDA4858BDE64825E7CBC0D51'  # ArchStrike
+      - 1EDDE2CDFC025D17F6DA9EC0ADAE6AD28A8F901A  # Sublime Text
+      - 9D5F1C051D146843CDA4858BDE64825E7CBC0D51  # ArchStrike
 
 - name: Install pacman config
   template:
@@ -10,22 +10,22 @@
     dest: /etc/pacman.conf
     mode: 0644
 
-- name: "Add keys to pacman"
-  shell: "pacman-key -r {{ item }}"
+- name: Add keys to pacman
+  shell: pacman-key -r {{ item }}
   loop: "{{ keys }}"
 
-- name: "Sign keys in pacman"
-  shell: "pacman-key --lsign-key {{ item }}"
+- name: Sign keys in pacman
+  shell: pacman-key --lsign-key {{ item }}
   loop: "{{ keys }}"
 
-- name: "Add keys to local keyring"
-  shell: "gpg --recv-keys {{ item }}"
+- name: Add keys to local keyring
+  shell: gpg --recv-keys {{ item }}
   become: true
   become_user: "{{ user }}"
   loop: "{{ keys }}"
 
-- name: "Add tor browser key"
-  shell: "gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser@torproject.org"
+- name: Add tor browser key
+  shell: gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser@torproject.org
   become: true
   become_user: "{{ user }}"
 
@@ -39,59 +39,59 @@
 - name: Allow aur_builder user to run pacman as root
   lineinfile:
     path: /etc/sudoers.d/11-install-aur_builder
-    line: 'aur_builder ALL=(ALL) NOPASSWD: /usr/bin/pacman'
+    line: "aur_builder ALL=(ALL) NOPASSWD: /usr/bin/pacman"
     create: true
-    validate: 'visudo -cf %s'
+    validate: visudo -cf %s
 
-- name: "Get installed packages"
-  shell: "pacman -Qq"
+- name: Get installed packages
+  shell: pacman -Qq
   become: true
   become_user: aur_builder
   register: installed_packages
 
 
-- name: "Install yay"
+- name: Install yay
   aur:
     skip_installed: true
     name: yay
   become: true
   become_user: aur_builder
 
-- name: "Install additional repo keyrings"
+- name: Install additional repo keyrings
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
-    - 'archstrike-keyring'
+    - archstrike-keyring
 
-- name: "Install ccache"
+- name: Install ccache
   aur:
     skip_installed: true
     name: ccache
   become: true
   become_user: aur_builder
 
-- name: "Install makepkg tools"
+- name: Install makepkg tools
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
     - pbzip2
     - zstd
 
-- name: "Install makepkg config"
+- name: Install makepkg config
   template:
     src: ./files/makepkg.conf
-    dest: "/etc/makepkg.conf"
+    dest: /etc/makepkg.conf
     mode: 0644
 
-- name: "Install Reflector"
+- name: Install Reflector
   aur:
     skip_installed: true
     name: reflector
@@ -108,5 +108,5 @@
 
 - name: Enable Reflector services
   systemd:
-    name: "reflector"
+    name: reflector
     enabled: true
diff --git a/tasks/power-saving.yml b/tasks/power-saving.yml
index 6bf6231..9bc20ab 100644
--- a/tasks/power-saving.yml
+++ b/tasks/power-saving.yml
@@ -1,24 +1,24 @@
-- name: "Install power-saving stuff"
+- name: Install power-saving stuff
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
-    - 'acpi'
+    - acpi
     - ethtool
     - nbfc
-    - 'powertop'
-    - 'psensor'
+    - powertop
+    - psensor
     - smartmontools
-    - 'sysstat'
+    - sysstat
     - tlp
     - xfce4-power-manager
 
 - name: Enable TLP services
   systemd:
-    name: "tlp"
+    name: tlp
     enabled: true
 
 - name: Enable NBFC
@@ -33,9 +33,9 @@
     dest: /etc/default/tlp
     mode: 0644
 
-- name: "Create XFCE4 power manager config directory"
+- name: Create XFCE4 power manager config directory
   file:
-    path: '{{ home }}/.config/xfce4/xfconf/xfce-perchannel-xml'
+    path: "{{ home }}/.config/xfce4/xfconf/xfce-perchannel-xml"
     state: directory
     owner: "{{ user }}"
     mode: 0755
diff --git a/tasks/python.yml b/tasks/python.yml
index 0ce01e3..a8fe8d4 100644
--- a/tasks/python.yml
+++ b/tasks/python.yml
@@ -1,20 +1,20 @@
-- name: "Install python packages"
+- name: Install python packages
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
-    - 'pyenv'
-    - 'python-pip'
-    - 'python-virtualenv'
-    - 'python2-pip'
-    - 'python2-virtualenv'
+    - pyenv
+    - python-pip
+    - python-virtualenv
+    - python2-pip
+    - python2-virtualenv
 
 - name: Create pyenv directory
   file:
     state: directory
-    path: '/opt/pyenv'
+    path: /opt/pyenv
     owner: "{{ user }}"
     group: users
diff --git a/tasks/security.yml b/tasks/security.yml
index 3e9b900..24a395e 100644
--- a/tasks/security.yml
+++ b/tasks/security.yml
@@ -1,14 +1,14 @@
-- name: "Install security-related packages"
+- name: Install security-related packages
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
-    - 'enpass-bin'
-    - 'qomui'
-    - 'wireguard-tools'
+    - enpass-bin
+    - qomui
+    - wireguard-tools
 
 - name: Create .ssh directory
   file:
diff --git a/tasks/shell.yml b/tasks/shell.yml
index d586dfc..a48778b 100644
--- a/tasks/shell.yml
+++ b/tasks/shell.yml
@@ -1,50 +1,49 @@
-- name: "Install shell packages"
+- name: Install shell packages
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
-    - 'advanced-ssh-config'
-    - 'alacritty'
+    - advanced-ssh-config
+    - alacritty
     - arch-install-scripts
-    - 'bat'
-    - 'catimg'
-    - 'climate'
-    - 'cmatrix'
-    - 'exa'
-    - 'fd'
-    - 'fpp'
-    - 'htop'
-    - 'jshon'
-    - 'jq'
-    - 'nnn'
-    - 'oh-my-zsh-git'
-    - 'pazi'
-    - 'perl-file-mimeinfo'
-    - 'pigz'
-    - 'pipes.sh'
-    - 'playerctl'
-    - 'progress'
-    - 'reptyr'
-    - 'ripgrep'
-    - 'scrcpy'
-    - 'screenfetch'
-    - 'speedtest-cli'
-    - 'sl'
-    - 'terminator'
-    - 'thefuck'
-    - 'tmux'
-    - 'tmux-xpanes'
-    - 'ruby-tmuxinator'
-    - 'xclip'
-    - 'xsel'
-    - 'zsh'
-    - 'zsh-completions'
-    - 'zsh-doc'
-    - 'zsh-syntax-highlighting'
-
+    - bat
+    - catimg
+    - climate
+    - cmatrix
+    - exa
+    - fd
+    - fpp
+    - htop
+    - jshon
+    - jq
+    - nnn
+    - oh-my-zsh-git
+    - pazi
+    - perl-file-mimeinfo
+    - pigz
+    - pipes.sh
+    - playerctl
+    - progress
+    - reptyr
+    - ripgrep
+    - scrcpy
+    - screenfetch
+    - speedtest-cli
+    - sl
+    - terminator
+    - thefuck
+    - tmux
+    - tmux-xpanes
+    - ruby-tmuxinator
+    - xclip
+    - xsel
+    - zsh
+    - zsh-completions
+    - zsh-doc
+    - zsh-syntax-highlighting
 
 - name: Install ZSH config
   template:
@@ -52,7 +51,7 @@
     dest: "{{ home }}/.zshrc"
     mode: 0644
     owner: "{{ user }}"
-    validate: "zsh -n %s"
+    validate: zsh -n %s
     backup: true
     trim_blocks: false
 
@@ -85,32 +84,32 @@
     - https://github.com/tmux-plugins/tmux-sensible
     - https://github.com/tmux-plugins/tmux-fpp
 
-- name: "Create alacritty config directory"
+- name: Create alacritty config directory
   file:
-    path: '{{ home }}/.config/alacritty/'
+    path: "{{ home }}/.config/alacritty/"
     state: directory
     owner: "{{ user }}"
     mode: 0755
 
-- name: "Create alacritty config"
+- name: Create alacritty config
   copy:
-    src: './files/alacritty.yml'
-    dest: '{{ home }}/.config/alacritty/alacritty.yml'
+    src: ./files/alacritty.yml
+    dest: "{{ home }}/.config/alacritty/alacritty.yml"
     mode: 0644
     owner: "{{ user }}"
 
 
-- name: "Create terminator directory"
+- name: Create terminator directory
   file:
-    path: '{{ home }}/.config/terminator/'
+    path: "{{ home }}/.config/terminator/"
     state: directory
     owner: "{{ user }}"
     mode: 0755
 
-- name: "Create alacritty config"
+- name: Create alacritty config
   copy:
-    src: './files/terminator.conf'
-    dest: '{{ home }}/.config/terminator/config'
+    src: ./files/terminator.conf
+    dest: "{{ home }}/.config/terminator/config"
     mode: 0644
     owner: "{{ user }}"
 
@@ -126,7 +125,7 @@
 - name: Install custom scripts
   copy:
     src: ./files/bin
-    dest: "/usr/local"
+    dest: /usr/local
     mode: 0755
     directory_mode: 0755
 
@@ -134,5 +133,5 @@
   lineinfile:
     path: /etc/vconsole.conf
     state: present
-    line: 'KEYMAP=uk'
+    line: KEYMAP=uk
     create: true
diff --git a/tasks/user.yml b/tasks/user.yml
index 8dac907..3e299d9 100644
--- a/tasks/user.yml
+++ b/tasks/user.yml
@@ -3,7 +3,7 @@
     name: "{{ user }}"
     home: "{{ home }}"
     comment: Jake Howard
-    shell: '/usr/bin/zsh'
+    shell: /usr/bin/zsh
     system: true
     groups:
       - audio
diff --git a/tasks/vim.yml b/tasks/vim.yml
index 3c91bee..208517f 100644
--- a/tasks/vim.yml
+++ b/tasks/vim.yml
@@ -1,13 +1,13 @@
-- name: "Install dev packages"
+- name: Install dev packages
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
-    - 'gvim'
-    - 'vim-pathogen'
+    - gvim
+    - vim-pathogen
 
 - name: Install vimrc
   copy:
@@ -27,7 +27,7 @@
 
 - name: Create vim packages directory
   file:
-    path: '{{ home }}/.vim/bundle'
+    path: "{{ home }}/.vim/bundle"
     state: directory
     owner: "{{ user }}"
     mode: 0755
@@ -40,10 +40,10 @@
   become: true
   become_user: "{{ user }}"
   loop:
-    - 'https://github.com/junegunn/goyo.vim'
-    - 'https://github.com/itchyny/lightline.vim'
-    - 'https://github.com/scrooloose/nerdtree'
-    - 'https://github.com/vim-scripts/peaksea'
-    - 'https://github.com/terryma/vim-multiple-cursors'
-    - 'https://github.com/jremmen/vim-ripgrep'
-    - 'https://github.com/amix/vim-zenroom2'
+    - https://github.com/junegunn/goyo.vim
+    - https://github.com/itchyny/lightline.vim
+    - https://github.com/scrooloose/nerdtree
+    - https://github.com/vim-scripts/peaksea
+    - https://github.com/terryma/vim-multiple-cursors
+    - https://github.com/jremmen/vim-ripgrep
+    - https://github.com/amix/vim-zenroom2
diff --git a/tasks/vscode.yml b/tasks/vscode.yml
index 12aa3ca..7f70630 100644
--- a/tasks/vscode.yml
+++ b/tasks/vscode.yml
@@ -1,17 +1,17 @@
-- name: "Install VSCode packages"
+- name: Install VSCode packages
   aur:
     skip_installed: true
     name: "{{ item }}"
   become: true
   become_user: aur_builder
-  when: "item not in installed_packages.stdout_lines"
+  when: item not in installed_packages.stdout_lines
   loop:
-    - 'visual-studio-code-bin'
-    - 'universal-ctags-git'
+    - visual-studio-code-bin
+    - universal-ctags-git
 
 - name: Create VSCode user directory
   file:
-    path: '{{ home }}/.config/Code/User'
+    path: "{{ home }}/.config/Code/User"
     state: directory
     owner: "{{ user }}"
     mode: 0755
@@ -30,8 +30,8 @@
     mode: 0644
     owner: "{{ user }}"
 
-- name: "Get VSCode extensions"
-  shell: "code --list-extensions"
+- name: Get VSCode extensions
+  shell: code --list-extensions
   become: true
   become_user: "{{ user }}"
   register: vscode_extensions
@@ -39,37 +39,37 @@
 - name: Define VSCode extensions
   set_fact:
     requested_vscode_extensions:
-      - 'PKief.material-icon-theme'
-      - 'Zignd.html-css-class-completion'
-      - 'christian-kohler.npm-intellisense'
-      - 'dbaeumer.vscode-eslint'
-      - 'eamodio.gitlens'
-      - 'ms-vscode.vscode-typescript-tslint-plugin'
-      - 'ionutvmi.path-autocomplete'
-      - 'mrmlnc.vscode-less'
-      - 'mrmlnc.vscode-scss'
-      - 'ms-python.python'
-      - 'ms-vscode.sublime-keybindings'
-      - 'rokoroku.vscode-theme-darcula'
-      - 'truman.autocomplate-shell'
-      - 'wholroyd.jinja'
-      - 'formulahendry.auto-close-tag'
-      - 'James-Yu.latex-workshop'
-      - 'streetsidesoftware.code-spell-checker'
-      - 'EditorConfig.EditorConfig'
-      - 'vsciot-vscode.vscode-arduino'
-      - 'vscoss.vscode-ansible'
-      - 'rust-lang.rust'
-      - 'pnp.polacode'
-      - 'mrmlnc.vscode-duplicate'
-      - 'Tyriar.sort-lines'
-      - 'esbenp.prettier-vscode'
-      - 'jspolancor.presentationmode'
-      - 'ms-vscode.cpptools'
-      - 'ms-vscode-remote.remote-containers'
-      - 'ms-azuretools.vscode-docker'
-      - 'mrcrowl.hg'
-      - 'yzhang.markdown-all-in-one'
+      - PKief.material-icon-theme
+      - Zignd.html-css-class-completion
+      - christian-kohler.npm-intellisense
+      - dbaeumer.vscode-eslint
+      - eamodio.gitlens
+      - ms-vscode.vscode-typescript-tslint-plugin
+      - ionutvmi.path-autocomplete
+      - mrmlnc.vscode-less
+      - mrmlnc.vscode-scss
+      - ms-python.python
+      - ms-vscode.sublime-keybindings
+      - rokoroku.vscode-theme-darcula
+      - truman.autocomplate-shell
+      - wholroyd.jinja
+      - formulahendry.auto-close-tag
+      - James-Yu.latex-workshop
+      - streetsidesoftware.code-spell-checker
+      - EditorConfig.EditorConfig
+      - vsciot-vscode.vscode-arduino
+      - vscoss.vscode-ansible
+      - rust-lang.rust
+      - pnp.polacode
+      - mrmlnc.vscode-duplicate
+      - Tyriar.sort-lines
+      - esbenp.prettier-vscode
+      - jspolancor.presentationmode
+      - ms-vscode.cpptools
+      - ms-vscode-remote.remote-containers
+      - ms-azuretools.vscode-docker
+      - mrcrowl.hg
+      - yzhang.markdown-all-in-one
       - jock.svg
       - naumovs.color-highlight
       - pranaygp.vscode-css-peek
@@ -84,16 +84,16 @@
       - vstirbu.vscode-mermaid-preview
 
 
-- name: "Install VSCode extensions"
-  shell: "code --install-extension {{ item }} --force"
+- name: Install VSCode extensions
+  shell: code --install-extension {{ item }} --force
   become: true
   become_user: "{{ user }}"
-  when: "item not in vscode_extensions.stdout_lines"
+  when: item not in vscode_extensions.stdout_lines
   loop: "{{ requested_vscode_extensions }}"
 
-- name: "Remove unwanted VSCode extensions"
-  shell: "code --uninstall-extension {{ item }}"
+- name: Remove unwanted VSCode extensions
+  shell: code --uninstall-extension {{ item }}
   become: true
   become_user: "{{ user }}"
-  when: "item not in requested_vscode_extensions"
+  when: item not in requested_vscode_extensions
   loop: "{{ vscode_extensions.stdout_lines }}"
diff --git a/vars.yml b/vars.yml
index 28cc9ed..0acf835 100644
--- a/vars.yml
+++ b/vars.yml
@@ -1,2 +1,2 @@
 user: jake
-home: "/home/{{ user }}"
+home: /home/{{ user }}
diff --git a/yamllint.yml b/yamllint.yml
index aa6adf7..410bd7a 100644
--- a/yamllint.yml
+++ b/yamllint.yml
@@ -1,6 +1,10 @@
 extends: default
 
 rules:
-  document-start: "disable"
+  document-start: disable
+  truthy: disable
+  quoted-strings:
+    quote-type: double
+    required: only-when-needed
   line-length:
     max: 150