diff --git a/resources/InstallResources/xfce-config/plank/plank-launchers/firefox-esr.dockitem b/resources/InstallResources/xfce-config/plank/plank-launchers/firefox-esr.dockitem
deleted file mode 100644
index 851a492..0000000
--- a/resources/InstallResources/xfce-config/plank/plank-launchers/firefox-esr.dockitem
+++ /dev/null
@@ -1,2 +0,0 @@
-[PlankDockItemPreferences]
-Launcher=file:///usr/share/applications/firefox-esr.desktop
diff --git a/resources/InstallResources/xfce-config/xfce-perchannel-xml/xfce4-power-manager.xml b/resources/InstallResources/xfce-config/xfce-perchannel-xml/xfce4-power-manager.xml
index 700307d..897ea0c 100644
--- a/resources/InstallResources/xfce-config/xfce-perchannel-xml/xfce4-power-manager.xml
+++ b/resources/InstallResources/xfce-config/xfce-perchannel-xml/xfce4-power-manager.xml
@@ -19,5 +19,6 @@
     <property name="lid-action-on-battery" type="uint" value="1"/>
     <property name="logind-handle-lid-switch" type="bool" value="true"/>
     <property name="lid-action-on-ac" type="uint" value="1"/>
+    <property name="lock-screen-suspend-hibernate" type="bool" value="false"/>
   </property>
-</channel>
\ No newline at end of file
+</channel>
diff --git a/scripts/InstallScripts/InstallPackages.sh b/scripts/InstallScripts/InstallPackages.sh
index e7f4666..735db08 100755
--- a/scripts/InstallScripts/InstallPackages.sh
+++ b/scripts/InstallScripts/InstallPackages.sh
@@ -48,6 +48,9 @@ then
   #Make plank autostart
   cp $DIR/xfce-config/plank/plank.desktop /etc/xdg/autostart/
 
+  #install plank launcher
+  mkdir -p /etc/skel/.config/plank/dock1/launchers/
+  cp $DIR/xfce-config/plank/plank-launchers/* /etc/skel/.config/plank/dock1/launchers/
 fi
 
 
@@ -66,9 +69,6 @@ adduser $username
 usermod -a -G sudo,netdev,input $username
 
 
-#install plank launchers #TODO: Disabled as doing it this way causes xconf or xfce4-session to not start??
-#[ "$DE" = "xfce" ] && mkdir -p /home/$username/.config/plank/dock1/launchers/
-#[ "$DE" = "xfce" ] && cp $DIR/xfce-config/plank/plank-launchers/* /home/$username/.config/plank/dock1/launchers/