diff --git a/deploy.sh b/deploy.sh
index 014abd5..566dee3 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -2,8 +2,8 @@
 
 set -e
 
-patch /usr/bin/makepkg < makepkg.patch
-
 puppet apply manifests/main.pp --modulepath=modules/ --verbose
 
+patch /usr/bin/makepkg < makepkg.patch
+puppet apply manifests/packages.pp --modulepath=modules/ --verbose
 patch /usr/bin/makepkg -R < makepkg.patch
diff --git a/modules/yaourt/manifests/packages.pp b/manifests/packages.pp
similarity index 84%
rename from modules/yaourt/manifests/packages.pp
rename to manifests/packages.pp
index 8d17bbf..b906ee2 100644
--- a/modules/yaourt/manifests/packages.pp
+++ b/manifests/packages.pp
@@ -1,4 +1,4 @@
-class yaourt::packages () {
+node default {
   package {[
     'acpi',
     'advanced-ssh-config',
@@ -22,10 +22,6 @@ class yaourt::packages () {
     'freac',
     'gimp',
     'glogg',
-    'gnome-shell-extension-drop-down-terminal-git',
-    'gnome-shell-extension-laine-git',
-    'gnome-shell-extension-put-window-git',
-    'gnome-shell-extension-topicons-plus',
     'gnome-shell-mousewheel-zoom',
     'google-earth',
     'gparted',
@@ -70,12 +66,12 @@ class yaourt::packages () {
     'slack-desktop',
     'spotify',
     'steam',
-    'sublime-text-dev',
     'sysstat',
     'terminator',
     'thefuck',
     'thunderbird',
     'tig',
+    'tor-browser-en',
     'ttf-emojione-color',
     'ttf-google-fonts-git',
     'ttf-ms-fonts',
@@ -86,8 +82,6 @@ class yaourt::packages () {
     'vim',
     'virtualbox',
     'vivaldi',
-    'vivaldi-ffmpeg-codecs',
-    'vivaldi-widevine',
     'vlc',
     'vundle',
     'wps-office',
@@ -100,6 +94,6 @@ class yaourt::packages () {
     'zsh-completions',
     'zsh-doc'
   ]:
-    ensure => latest
+    ensure => installed
   }
 }
diff --git a/modules/config/manifests/vim.pp b/modules/config/manifests/vim.pp
index 1591173..74763f0 100644
--- a/modules/config/manifests/vim.pp
+++ b/modules/config/manifests/vim.pp
@@ -17,7 +17,6 @@ class config::vim {
   exec { 'install vim plugins':
     command => "vim +PluginInstall +qall",
     user => "jake",
-    environment => "HOME=/home/jake",
-    require => Package['vim']
+    environment => "HOME=/home/jake"
   }
 }
diff --git a/modules/yaourt/manifests/init.pp b/modules/yaourt/manifests/init.pp
index cea9eb2..6ae7ffd 100644
--- a/modules/yaourt/manifests/init.pp
+++ b/modules/yaourt/manifests/init.pp
@@ -1,7 +1,5 @@
 class yaourt {
   include 'yaourt::files'
 
-  # include 'yaourt::keys'
-
-  include 'yaourt::packages'
+  include 'yaourt::keys'
 }