diff --git a/modules/desktop/manifests/init.pp b/modules/desktop/manifests/init.pp
index 53bdc7956963a66e521413a127e32e0930008990..05555bdf99b07aa29224253424c16dec65e90d5d 100644
--- a/modules/desktop/manifests/init.pp
+++ b/modules/desktop/manifests/init.pp
@@ -13,6 +13,45 @@ class desktop {
 		require => Package['xinit'],
 	}
 
+	$dms = [
+		'lightdm*',
+		'kdm',
+		'gdm3',
+		'nodm',
+		'wdm',
+		'xdm',
+		'slim',
+	]
+
+	package { $dms:
+		ensure => absent,
+		require => Package['lxde'],
+	}
+
+	$packages = [
+		'pcmanfm',
+		'iceweasel',
+		'iceweasel-l10n-*',
+		'gstreamer1.0-libav',
+		'gstreamer1.0-plugins-good',
+		'flashplugin-nonfree',
+		'chromium',
+		'chromium-l10n',
+		'libreoffice',
+		'libreoffice-help-*',
+		'libreoffice-l10n-*',
+		'ttf-mscorefonts-installer',
+		'ttf-liberation',
+		'fonts-crosextra-carlito',
+		'fonts-crosextra-caladea',
+                'florence',
+
+	]
+  
+	package { $packages:
+		ensure => installed,
+	}
+
 	file { '/etc/skel/Desktop/libreoffice-startcenter.desktop':
 		source => '/usr/share/applications/libreoffice-startcenter.desktop',
 		require => [
@@ -93,44 +132,6 @@ class desktop {
 		onlyif => '/bin/grep -vq "^Name.*=Filemanager" /etc/skel/Desktop/pcmanfm.desktop',
 	}
 
-	$dms = [
-		'lightdm*',
-		'kdm',
-		'gdm3',
-		'nodm',
-		'wdm',
-		'xdm',
-		'slim',
-	]
-
-	package { $dms:
-		ensure => absent,
-		require => Package['lxde'],
-	}
-
-	$packages = [
-		'iceweasel',
-		'iceweasel-l10n-*',
-		'gstreamer1.0-libav',
-		'gstreamer1.0-plugins-good',
-		'flashplugin-nonfree',
-		'chromium',
-		'chromium-l10n',
-		'libreoffice',
-		'libreoffice-help-*',
-		'libreoffice-l10n-*',
-		'ttf-mscorefonts-installer',
-		'ttf-liberation',
-		'fonts-crosextra-carlito',
-		'fonts-crosextra-caladea',
-                'florence',
-
-	]
-  
-	package { $packages:
-		ensure => installed,
-	}
-
 	file { '/etc/skel/Desktop/iceweasel.desktop':
 		source => '/usr/share/applications/iceweasel.desktop',
 		replace => false,