diff --git a/README.rst b/README.rst
index 89fea6875813133dbfb6d01cf494fdfb62253ba7..2a87c1e0970f009d3efd923112df9aad8c6f4a4e 100644
--- a/README.rst
+++ b/README.rst
@@ -25,7 +25,7 @@ Installs packages with APT and different languages package managers.
 Skype
 =====
 
-Installs Skype from the Debian package, there's no repository.
+Installs the Skype Debian package since there's no repository.
 
 .. code:: shell
 
@@ -35,7 +35,7 @@ Can be added as a Cron job under root for updates.
 
 .. code:: shell
 
-    ansible-playbook --connection local --inventory-file localhsot, --verbose skype.yml | logger
+    ansible-playbook --connection local --inventory-file localhost, --verbose skype.yml | logger
 
 Dropbox
 =======
diff --git a/desktop.yml b/desktop.yml
index ee8b76bdd9d065a845b364d9a8b72f3031de9e3c..d2befa8754b4f566b0f5c64643c5d68dcca2e3d2 100644
--- a/desktop.yml
+++ b/desktop.yml
@@ -3,6 +3,10 @@
   become: yes
   become_user: root
   tasks:
+  - assert:
+      that:
+      - ansible_pkg_mgr == 'apt'
+
   - name: apt install
     with_items:
     - plymouth
diff --git a/dropbox.yml b/dropbox.yml
index c91e18f42c2307848c12db465e8992c0a9e2e59e..75274271127fa256ff572a2e5d119d6fe7539272 100644
--- a/dropbox.yml
+++ b/dropbox.yml
@@ -2,6 +2,14 @@
 - hosts: all
   become: no
   tasks:
+      - assert:
+          that:
+              - ansible_architecture == 'x86_64'
+
+      - name: Verify that Python is installed
+        shell: python --version
+        changed_when: False
+
       - name: Download Dropbox tarball
         get_url:
             url: https://www.dropbox.com/download?plat=lnx.x86_64
@@ -21,3 +29,9 @@
             url: https://www.dropbox.com/download?dl=packages/dropbox.py
             dest: '{{ ansible_user_dir }}/.dropbox-dist/dropbox.py'
             mode: 0o0755
+
+      - name: Add autostart launcher
+        template:
+            src: dropbox.py.desktop.j2
+            dest: '{{ ansible_user_dir }}/.config/autostart/dropbox.py.desktop'
+            mode: 0o0644
diff --git a/pkgs.yml b/pkgs.yml
index 67e7b812336c988c76b9fa4894d0750281e1928d..74dbe6bd77e22eed89f00be1fbd5c9e9e3c0c152 100644
--- a/pkgs.yml
+++ b/pkgs.yml
@@ -4,105 +4,113 @@
   vars:
       apt:
           - ansible
-          - acpi
           - apache2-utils
-          - at
+          - apt-listchanges
+          - apt-xapian-index
           - awscli
-          - bluedevil
-          - bluetooth
+          - bijiben
           - bluez-firmware
-          - btrfs-progs
-          - busybox
+          - brasero
           - capistrano
           - cargo
           - clojure1.6
+          - cmake
           - cryptsetup
+          - deborphan
+          - dejadup
+          - dh-make
           - dnsmasq
-          - docker.io
+          - dnsutils
+          - docker-compose
           - dos2unix
+          - dvd+rw-tools
           - easy-rsa
+          - epiphany-browser
           - fabric
+          - file-roller
           - firmware-intel-sound
           - firmware-iwlwifi
           - firmware-linux
           - flake8
-          - fonts-oxygen
-          - gdisk
+          - ftp
+          - geary
+          - ghex
           - git-annex
           - git-buildpackage
+          - gnome-boxes
+          - gnome-calendar
+          - gnome-clocks
+          - gnome-core
+          - gnome-documents
+          - gnome-logs
+          - gnome-maps
+          - gnome-music
+          - gnome-photos
+          - gnome-shell-extension-gpaste
+          - gnome-software
+          - gnome-todo
+          - gnome-weather
           - golang
           - grub-efi-amd64
-          - gstreamer1.0-libav
           - gstreamer1.0-vaapi
-          - gstreamer1.0-x
+          - hunspell
           - hyphen-en-us
-          - intel-microcode
-          - iputils-arping
           - iputils-ping
-          - kde-config-sddm
-          - kde-config-touchpad
-          - kdeconnect
-          - kdegraphics-mobipocket
-          - kdegraphics-strigi-analyzer
-          - kdegraphics-thumbnailers
-          - kdesudo
-          - kde-telepathy
-          - keepassx
-          - kio-extras
-          - kompare
-          - kontact
+          - keepass2
           - kpcli
-          - kscreen
-          - kwalletcli
-          - kwin-x11
-          - linux-headers-amd64
+          - libnss-resolve
+          - libpam-mount
+          - libreoffice-pdfimport
           - linux-image-amd64
+          - liferea
           - luarocks
-          - lxqt
-          - muon-discover
-          - muon-notifier
-          - muon-updater
+          - meld
           - mythes-en-us
+          - netcat-openbsd
+          - network-manager-gnome
+          - network-manager-pptp-gnome
           - nodejs-legacy
-          - notification-daemon
           - npm
-          - ntfs-3g
-          - obconf-qt
+          - pandoc
           - pelican
-          - plasma-nm
-          - plasma-workspace-wayland
-          - powerdevil
+          - plymouth-themes
+          - polari
+          - printer-driver-all
           - pry
-          - pulseaudio-module-x11
-          - python3-dev
           - python3-pip
-          - python3-wheel
+          - python3-venv
           - python-dev
+          - python-parse
           - python-pip
+          - python-sh
           - python-virtualenv
           - reprepro
-          - sbuild
-          - systemsettings
+          - resolveconf
+          - simple-scan
+          - strongswan-nm
           - task-english
           - task-hebrew
           - task-hebrew-desktop
-          - task-hebrew-kde-desktop
-          - task-kde-desktop
+          - task-hebrew-gnome-desktop
+          - task-gnome-desktop
           - task-laptop
           - task-print-server
           - task-ssh-server
+          - telnet
           - texlive-latex-base
           - texlive-fonts-recommended
+          - texlive-luatex
           - time
           - tmux
           - tox
           - twine
-          - va-driver-all
+          - ufw
+          - uidmap
+          - vcdimager
           - vagrant
-          - vdpau-driver-all
           - vim-nox
+          - vinagre
           - virtualbox-qt
-          - vlc-plugin-notify
           - xdg-user-dirs 
       go:
           - github.com/giantswarm/semver-bump
@@ -112,13 +120,11 @@
           - yo
           - grunt-cli
           - gulp
+          - webcoach
+          - sitespeed.io
       pip:
           - ansible-lint
           - molecule
-          - docker-compose
-          - pbr
-          - parse
-          - sh
           - pre-commit
           - proselint
           - testinfra
@@ -127,6 +133,10 @@
           - rustfmt
 
   tasks:
+      - assert:
+          that:
+              - ansible_pkg_mgr == 'apt'
+
       - name: apt install
         when: apt is iterable and ansible_pkg_mgr == 'apt'
         become: yes
@@ -136,7 +146,6 @@
             state: latest
             purge: yes
             force: yes
-            install_recommends: no
             update_cache: yes
             cache_valid_time: 3600
 
diff --git a/skype.yml b/skype.yml
index 12a440da7aad274a7c448804e9a42e3457d3560e..ba0bb2ea2560aea055bf305cbc43863b13cf5e56 100644
--- a/skype.yml
+++ b/skype.yml
@@ -3,8 +3,32 @@
   become: yes
   become_user: root
   tasks:
+      - assert:
+          that:
+              - ansible_architecture in [ 'x86_64', 'x86' ]
+              - ansible_pkg_mgr == 'apt'
+
+      - name: Add i386 architecture to dpkg
+        command: /usr/bin/dpkg --add-architecture i386
+        changed_when: False
+
       - name: APT install dependencies
         with_items:
+            - libc6:i386
+            - libqt4-dbus:i386
+            - libqt4-network:i386
+            - libqt4-xml:i386
+            - libqtcore4:i386
+            - libqtgui4:i386
+            - libqtwebkit4:i386
+            - libstdc++6:i386
+            - libx11-6:i386
+            - libxext6:i386
+            - libxss1:i386
+            - libxv1:i386
+            - libssl1.0.0:i386
+            - libpulse0:i386
+            - libasound2-plugins:i386
         apt:
             name: '{{ item }}'
             state: present
@@ -15,7 +39,6 @@
         get_url:
             src: http://www.skype.com/go/getskype-linux-deb
             dest: /root/skype.deb
-        register: get_skype_package
 
       - name: Install Skype Debian package
         apt:
diff --git a/skype_update b/skype_update
deleted file mode 100755
index e104de44cf90830eb478e61092884fdbd056ae6f..0000000000000000000000000000000000000000
--- a/skype_update
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-tempfile="$(mktemp)"
-wget http://www.skype.com/go/getskype-linux-deb \
-    --quiet \
-    --output-document "$tempfile"
-dpkg --install --skip-same-version -G "$tempfile" 2>&1 | logger
-rm "$tempfile"
diff --git a/files/dropbox.py.desktop b/templates/dropbox.py.desktop.j2
similarity index 54%
rename from files/dropbox.py.desktop
rename to templates/dropbox.py.desktop.j2
index fe960a2b5baa0e7afe125cf4ddbe0b5f1e2950aa..403126f1a4aa9b471b653d8e038cec53b3de60ff 100644
--- a/files/dropbox.py.desktop
+++ b/templates/dropbox.py.desktop.j2
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=/home/nimrod/dropbox.py start
+Exec={{ ansible_user_dir }}/.dropbox-dist/dropbox.py start
 Icon=system-run
 Path=
 Terminal=false