diff --git a/README.md b/README.md
index dd4978852..25f42f4fc 100644
--- a/README.md
+++ b/README.md
@@ -6,27 +6,39 @@ Usage: sudo -E cnchi.py
 
 To create logs to help debug problems: sudo -E cnchi.py -dv
 
+## Translations
+
+We manage our translations in transifex:
+
+* https://www.transifex.com/projects/p/antergos/
+
 ## Dependencies
 
- * gtk 3
- * python 3
- * python-gobject 3
- * python-dbus
+ * gtk3
+ * python3
  * python-cairo
+ * python-dbus
+ * python-gobject
  * python-mako
+ * pyparted (parted, dosfstools, mtools, ntfs-3g, ntfsprogs)
+ * pyalpm (pacman)
  * libtimezonemap
- * webkitgtk
- * parted (dosfstools, mtools, ntfs-3g, ntfsprogs)
- * py3parted (pyparted on python3) -> https://github.com/antergos/antergos-packages/tree/master/py3parted
- * pacman
- * pyalpm
- * hwinfo
+ * webkitgtk 
  * hdparm
+ * hwinfo
  * upower
- * python-mock (only needed for unit tests)
+ 
+#### Unit tests
 
-## Translations
+ * python-mock 
 
-We manage our translations in transifex:
+#### Fonts needed by the keyboard widget
+
+ * ttf-aboriginal-sans
+ * ttf-indic-otf
+ * ttf-khmer
+ * ttf-lohit-fonts
+ * ttf-myanmar3
+ * ttf-thaana-fonts
+ * ttf-tlwg
 
-* https://www.transifex.com/projects/p/antergos/
diff --git a/data/packages.xml b/data/packages.xml
index a5d960c56..c68e6f254 100644
--- a/data/packages.xml
+++ b/data/packages.xml
@@ -96,6 +96,8 @@
         <pkgname>gnome-screenshot</pkgname>
         <pkgname>gnome-shell</pkgname>
         <pkgname>gnome-shell-extensions</pkgname>
+        <!-- <pkgname>gnome-shell-extension-dash-to-dock</pkgname> -->
+        <pkgname>gnome-shell-extension-lockscreen-lightdm</pkgname>
         <pkgname>gnome-system-monitor</pkgname>
         <pkgname>gnome-terminal</pkgname>
         <pkgname>gnome-themes-standard</pkgname>
diff --git a/scripts/postinstall.sh b/scripts/postinstall.sh
index 0f25862ea..3dfae42f5 100755
--- a/scripts/postinstall.sh
+++ b/scripts/postinstall.sh
@@ -79,7 +79,29 @@ gnome_settings(){
 
 	## Set defaults directories
 	chroot ${DESTDIR} su -c xdg-user-dirs-update ${USER_NAME}
-	}
+	
+	
+	# xscreensaver config
+	cat << EOF > ${DESTDIR}/home/${USER_NAME}/.xscreensaver 
+newLoginCommand: dm-tool switch-to-greeter
+timeout:	0:10:00
+EOF
+
+	cp ${DESTDIR}/home/${USER_NAME}/.xscreensaver ${DESTDIR}/etc/skel
+
+	cat << EOF > ${DESTDIR}/etc/xdg/autostart/xscreensaver.desktop
+[Desktop Entry]
+Name=xscreensaver
+Exec=/usr/bin/xscreensaver -no-splash &
+Terminal=false
+Type=Application
+Icon=screensaver
+StartupNotify=false
+X-GNOME-Autostart-Delay=30
+Categories=System;Display;GTK;
+EOF
+
+}
 
 cinnamon_settings(){
 	# Set Adwaita cursor theme
diff --git a/scripts/set-settings b/scripts/set-settings
index fd8b4fdf7..d58265068 100755
--- a/scripts/set-settings
+++ b/scripts/set-settings
@@ -24,6 +24,9 @@ if [[ ${DESKTOP} == 'gnome' ]];then
 
 	# Set icon theme
 	dbus-launch gsettings set org.gnome.desktop.interface icon-theme "Faenza-Dark"
+	
+	# Enable lockscreen extension
+	dbus-launch gsettings set org.gnome.shell enabled-extensions "['lockscreen@dev.antergos.com']"
 
 fi
 
diff --git a/src/info.py b/src/info.py
index 44f4a08a0..ee0d2f31b 100644
--- a/src/info.py
+++ b/src/info.py
@@ -22,7 +22,7 @@
 
 """ Set some Cnchi global constants """
 
-CNCHI_VERSION = "0.5.41"
+CNCHI_VERSION = "0.5.42"
 CNCHI_LAST_STABLE = "0.4.3"
 CNCHI_WEBSITE = "http://www.antergos.com"
 
diff --git a/src/installation/process.py b/src/installation/process.py
index 16b4f3f59..1c9213dab 100644
--- a/src/installation/process.py
+++ b/src/installation/process.py
@@ -1396,16 +1396,17 @@ def copy_files_progress(self, src, dst):
         """ Copy files updating the slides' progress bar """
         percent = 0.0
         items = os.listdir(src)
-        step = 1.0 / len(items)
-        for item in items:
-            self.queue_event('percent', percent)
-            source = os.path.join(src, item)
-            destination = os.path.join(dst, item)
-            try:
-                shutil.copy2(source, destination)
-            except (FileExistsError, shutil.Error) as err:
-                logging.warning(err)
-            percent += step
+        if len(items) > 0:
+            step = 1.0 / len(items)
+            for item in items:
+                self.queue_event('percent', percent)
+                source = os.path.join(src, item)
+                destination = os.path.join(dst, item)
+                try:
+                    shutil.copy2(source, destination)
+                except (FileExistsError, shutil.Error) as err:
+                    logging.warning(err)
+                percent += step
 
     def setup_features(self):
         """ Do all set up needed by the user's selected features """