diff --git a/bootstrap.yml b/bootstrap.yml
index 04ba6cc..4c6d070 100644
--- a/bootstrap.yml
+++ b/bootstrap.yml
@@ -2,41 +2,57 @@
 - hosts: localhost
   become: true
   tasks:
+    - name: Update
+      ansible.builtin.apt:
+        update_cache: true
+        upgrade: true
     - name: Install software
-      apt:
+      ansible.builtin.apt:
         name: "{{ item }}"
         state: present
       loop:
         - acl
         - alien
         - apparmor
+        - apparmor-notify
+        - apparmor-profiles
+        - apparmor-profiles-extra
+        - apparmor-utils
         - apt-transport-https
         - aptitude
         - ardour
         - at
         - audacity
+        - avahi-daemon
+        - bladerf
         - blender
         - bmon
         - brasero
-        - bsdtar
         - build-essential
+        - ca-certificates
         - caffeine
         - calibre
         - chromium-browser
         - chromium-codecs-ffmpeg-extra
         - cifs-utils
         - clamtk
+        - clang
         - clementine
+        - cmake
+        - cpufrequtils
         - cups
         - curl
         - darktable
+        - dconf-editor
         - devscripts
+        - dia
         - dosbox
         - dsniff
         - dump
         - dvdbackup
-        - dvdrip
+        - easytag
         - empathy
+        - enigmail
         - ethtool
         - exiv2
         - extremetuxracer
@@ -48,25 +64,28 @@
         - figlet
         - filezilla
         - firefox
-        - fslint
+        - flameshot
         - ftp
-        - fuse
+        - fuse3
+        - gdebi
         - geary
         - genisoimage
         - gigolo
         - gimp
         - git
+        - git-annex
+        - git-lfs
         - gnucash
         - gnupg
         - golang-go
         - gparted
         - gqrx-sdr
         - graphviz
-        - gtk-recordmydesktop
         - gufw
         - hackrf
         - handbrake
         - hedgewars
+        - heimdal-clients
         - hping3
         - htop
         - iftop
@@ -74,82 +93,106 @@
         - iperf3
         - ipset
         - iptables
-        - iptables-nftables-compat
         - iputils-ping
         - keepassx
-        - kodi
+        - kicad
+        - kitty
+        - ldap-utils
         - libacl1
+        - libmuparser-dev
         - libncurses5
         - libncursesw5
+        - libqt5charts5-dev
+        - libqt5svg5-dev
+        - libqt5x11extras5-dev
         - libreoffice
-        - librsync1
+        - librsync-dev
+        - librsync2
+        - lightdm
+        - lightdm-gtk-greeter
+        - lightdm-gtk-greeter-settings
         - lincity-ng
+        - linux-headers-generic
+        - linux-tools-generic
         - lm-sensors
+        - lsb-release
         - lua5.3
+        - lxc
         - lyx
         - lzop
         - mailutils
+        - mate-desktop
+        - mate-sensors-applet
+        - mate-tweak
         - mixxx
         - mksh
+        - mono-complete
         - moreutils
         - mplayer
         - mplayer-gui
         - mtr
         - multitail
+        - mumble
         - mypaint
-        - mysql-workbench
+        - mypaint-data
         - nagios-plugins
+        - nagios-plugins-contrib
         - nagios-snmp-plugins
         - ncdu
+        - neovim
         - netdiscover
+        - netwag
         - network-manager-gnome
         - network-manager-openvpn-gnome
         - network-manager-ssh-gnome
         - network-manager-vpnc-gnome
         - netwox
-        - netwox
         - neverball
         - neverputt
         - nftables
         - nload
         - nmap
         - nmon
+        - nomacs
         - nscd
         - ntp
         - ntpdate
         - numix-gtk-theme
         - numix-icon-theme
-        - openshot
         - openssh-server
         - openttd
         - openvpn
-        - pgadmin3
-        - phantomjs
+        - p7zip
+        - p7zip-full
+        - parole
+        - pidgin
         - pinta
         - playonlinux
         - postfix
         - printer-driver-cups-pdf
         - pv
         - pwgen
-        - python
-        - python-etcd
-        - python-gnupg
-        - python-mysql.connector
-        - python-mysqldb
-        - python-pip
-        - python-requests
         - python3
+        - python3-apt
         - python3-commandnotfound
+        - python3-croniter
+        - python3-dev
         - python3-etcd
+        - python3-gnupg
         - python3-mysqldb
+        - python3-pip
+        - python3-requests
         - python3-software-properties
+        - qalculate-gtk
         - qpdf
         - qsstv
+        - qtbase5-dev
+        - qtdeclarative5-dev
         - rdesktop
         - redshift-gtk
         - remmina
         - rename
-        - ring
+        - rhythmbox
         - rkhunter
         - rng-tools
         - rsync
@@ -157,42 +200,64 @@
         - samba
         - scribus
         - shc
+        - shotwell
         - shutter
+        - simple-scan
         - smartmontools
+        - smbclient
+        - smplayer
         - snmp
         - snmpd
         - software-properties-common
+        - sound-juicer
+        - soundconverter
         - speedometer
         - speedtest-cli
         - sqlite3
         - sqlitebrowser
+        - steghide
         - sudo
         - supertux
         - tar
         - tcpdump
         - telnet
-        - texlive
         - thunderbird
         - tig
+        - tightvncserver
+        - tmux
         - tor
         - traceroute
         - transmission-gtk
+        - tree
+        - tshark
+        - ttf-mscorefonts-installer
         - tuned
         - tuned-utils
+        - ubuntu-mate-desktop
         - ufw
         - uget
+        - unzip
         - vagrant
         - vim
         - virtualbox
+        - vlan
         - vlc
         - vsftpd
+        - wakeonlan
+        - webhttrack
         - wget
         - whois
+        - wine-stable
+        - winetricks
         - wireshark-gtk
         - xine-ui
         - xscreensaver-gl
         - xscreensaver-gl-extra
         - xscreensaver-screensaver-bsod
         - xtightvncviewer
+        - yamllint
         - youtube-dl
-        - zram-config
\ No newline at end of file
+        - zeal
+        - zip
+        - zram-config
+        - zsh