diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..cf19efd9722d9ed6a3502ca624d4ff2496493090
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,25 @@
+image:
+    name: debian:stretch
+    
+# Is performed before the scripts in the stages step
+before_script:
+  - apt-get update
+  - apt-get -y upgrade
+  - apt-get -y install apt-utils build-essential devscripts binutils debootstrap git syslinux squashfs-tools genisoimage 
+
+# Defines stages which are to be executed
+stages:  
+  - buildiso
+
+# Stage "buildiso"
+run-build:  
+  stage: buildiso
+  script:
+    - apt-get install -y 
+    - ./mkbuild iso amd64 devel.hamaralinux.org hamara-sugam beta
+
+# The files which are to be made available in GitLab
+  artifacts:
+    name: "hamara-sugam-2.0-build"
+    untracked: true
+    expire_in: 1 weeks
diff --git a/config.d/hamara-sugam/config/bootstrap b/config.d/hamara-sugam/config/bootstrap
index 25e119bf3a0dfc1938a265f1556a69c1ccc0f97f..d3558e0fe9424386fb08e04c49d2bc0d6c8b2170 100644
--- a/config.d/hamara-sugam/config/bootstrap
+++ b/config.d/hamara-sugam/config/bootstrap
@@ -13,52 +13,52 @@ LB_PARENT_DISTRIBUTION="namaste"
 LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="namaste"
 
 # $LB_PARENT_MIRROR_BOOTSTRAP: set parent mirror to bootstrap from
-# (Default: http://in.devel.hamaralinux.org/hamara-sugam)
-LB_PARENT_MIRROR_BOOTSTRAP="http://in.devel.hamaralinux.org/hamara-sugam"
+# (Default: http://devel.hamaralinux.org/hamara-sugam)
+LB_PARENT_MIRROR_BOOTSTRAP="http://devel.hamaralinux.org/hamara-sugam"
 
 # $LB_PARENT_MIRROR_CHROOT: set parent mirror to fetch packages from
-# (Default: http://in.devel.hamaralinux.org/hamara-sugam)
-LB_PARENT_MIRROR_CHROOT="http://in.devel.hamaralinux.org/hamara-sugam"
+# (Default: http://devel.hamaralinux.org/hamara-sugam)
+LB_PARENT_MIRROR_CHROOT="http://devel.hamaralinux.org/hamara-sugam"
 
 # $LB_PARENT_MIRROR_CHROOT_SECURITY: set security parent mirror to fetch packages from
 # (Default: http://security.debian.org/)
 LB_PARENT_MIRROR_CHROOT_SECURITY="http://security.debian.org/"
 
 # $LB_PARENT_MIRROR_BINARY: set parent mirror which ends up in the image
-# (Default: http://in.devel.hamaralinux.org/hamara-sugam)
-LB_PARENT_MIRROR_BINARY="http://in.devel.hamaralinux.org/hamara-sugam"
+# (Default: http://devel.hamaralinux.org/hamara-sugam)
+LB_PARENT_MIRROR_BINARY="http://devel.hamaralinux.org/hamara-sugam"
 
 # $LB_PARENT_MIRROR_BINARY_SECURITY: set security parent mirror which ends up in the image
-# (Default: http://in.devel.hamaralinux.org/hamara-sugam)
-LB_PARENT_MIRROR_BINARY_SECURITY="http://in.devel.hamaralinux.org/hamara-sugam"
+# (Default: http://devel.hamaralinux.org/hamara-sugam)
+LB_PARENT_MIRROR_BINARY_SECURITY="http://devel.hamaralinux.org/hamara-sugam"
 
 # $LB_PARENT_MIRROR_DEBIAN_INSTALLER: set debian-installer parent mirror
-# (Default: http://in.devel.hamaralinux.org/hamara-sugam)
-LB_PARENT_MIRROR_DEBIAN_INSTALLER="http://in.devel.hamaralinux.org/hamara-sugam"
+# (Default: http://devel.hamaralinux.org/hamara-sugam)
+LB_PARENT_MIRROR_DEBIAN_INSTALLER="http://devel.hamaralinux.org/hamara-sugam"
 
 # $LB_MIRROR_BOOTSTRAP: set mirror to bootstrap from
-# (Default: http://in.devel.hamaralinux.org/hamara-sugam)
-LB_MIRROR_BOOTSTRAP="http://in.devel.hamaralinux.org/hamara-sugam"
+# (Default: http://devel.hamaralinux.org/hamara-sugam)
+LB_MIRROR_BOOTSTRAP="http://devel.hamaralinux.org/hamara-sugam"
 
 # $LB_MIRROR_CHROOT: set mirror to fetch packages from
-# (Default: http://in.devel.hamaralinux.org/hamara-sugam)
-LB_MIRROR_CHROOT="http://in.devel.hamaralinux.org/hamara-sugam"
+# (Default: http://devel.hamaralinux.org/hamara-sugam)
+LB_MIRROR_CHROOT="http://devel.hamaralinux.org/hamara-sugam"
 
 # $LB_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from
 # (Default: http://security.debian.org/)
 LB_MIRROR_CHROOT_SECURITY="http://security.debian.org/"
 
 # $LB_MIRROR_BINARY: set mirror which ends up in the image
-# (Default: http://in.devel.hamaralinux.org/hamara-sugam)
-LB_MIRROR_BINARY="http://in.devel.hamaralinux.org/hamara-sugam"
+# (Default: http://devel.hamaralinux.org/hamara-sugam)
+LB_MIRROR_BINARY="http://devel.hamaralinux.org/hamara-sugam"
 
 # $LB_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
 # (Default: http://security.debian.org/)
 LB_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
 # $LB_MIRROR_DEBIAN_INSTALLER: set debian-installer mirror
-# (Default: http://in.devel.hamaralinux.org/hamara-sugam)
-LB_MIRROR_DEBIAN_INSTALLER="http://in.devel.hamaralinux.org/hamara-sugam"
+# (Default: http://devel.hamaralinux.org/hamara-sugam)
+LB_MIRROR_DEBIAN_INSTALLER="http://devel.hamaralinux.org/hamara-sugam"
 
 # $LB_BOOTSTRAP_QEMU_ARCHITECTURES: architectures to use foreign bootstrap
 # (Default: )
diff --git a/config.d/hamara-sugam/config/package-lists/desktop.list.chroot b/config.d/hamara-sugam/config/package-lists/desktop.list.chroot
index e4b7d3ab03c07228bbfff98a82c2ac07655f642d..99cfa5f9936409b732e513daa8b514c60d2c4b2c 100644
--- a/config.d/hamara-sugam/config/package-lists/desktop.list.chroot
+++ b/config.d/hamara-sugam/config/package-lists/desktop.list.chroot
@@ -16,4 +16,8 @@ materia-gtk-theme
 
 
 grub2
-grub-pc
\ No newline at end of file
+grub-pc
+
+#Multimedia
+gimp
+
diff --git a/config.d/hamara-sugam/config/package-lists/tools.list.chroot b/config.d/hamara-sugam/config/package-lists/tools.list.chroot
index 5b18403227a4c10afc0c0d5c3d11cf82e760cf5d..f19e15f57d1265339238d48aa9f51328adbd4ad5 100644
--- a/config.d/hamara-sugam/config/package-lists/tools.list.chroot
+++ b/config.d/hamara-sugam/config/package-lists/tools.list.chroot
@@ -66,3 +66,23 @@ xserver-xorg-input-synaptics
 xserver-xorg-input-multitouch
 xserver-xorg
 xserver-common
+
+
+
+# Adding GNOME Software center for installing applications
+gnome-software 
+gnome-software-plugin-flatpak
+gnome-software-plugin-limba
+
+#Adding some common utils
+util-linux
+gdisk
+dosfstools
+
+#Keyboard layout display in Calamares
+console-setup
+
+#Support for printers
+system-config-printer
+
+
diff --git a/config.d/hamara/config/binary b/config.d/hamara/config/binary
index 0b6b47ee0e8fb9325d2d20877b58e331cc6dbda5..c31b10d7921111e70cc1b96095065766a9b60e68 100644
--- a/config.d/hamara/config/binary
+++ b/config.d/hamara/config/binary
@@ -1,3 +1,4 @@
+figlet BUILDOPTIONS
 # config/binary - options for live-build(7), binary stage
 
 # $LB_BINARY_FILESYSTEM: set image filesystem
diff --git a/config.d/hamara/config/bootstrap b/config.d/hamara/config/bootstrap
index 15a94b8454774852069df1310e5a2a7f0c9a9a4a..1ccfa266efb61251759986ca58c14becbfcdbd9f 100644
--- a/config.d/hamara/config/bootstrap
+++ b/config.d/hamara/config/bootstrap
@@ -1,3 +1,4 @@
+figlet BOOTSTRAP
 # config/bootstrap - options for live-build(7), bootstrap stage
 
 # $LB_DISTRIBUTION: select distribution to use
@@ -5,20 +6,20 @@
 LB_DISTRIBUTION="svastik"
 
 # $LB_PARENT_DISTRIBUTION: select parent distribution to use
-# (Default: svastik)
-LB_PARENT_DISTRIBUTION="svastik"
+# (Default: stretch)
+LB_PARENT_DISTRIBUTION="stretch"
 
 # $LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION: select parent distribution for debian-installer to use
-# (Default: svastik)
+# (Default: stretch)
 LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="svastik"
 
 # $LB_PARENT_MIRROR_BOOTSTRAP: set parent mirror to bootstrap from
 # (Default: http://in.devel.hamaralinux.org/hamara)
-LB_PARENT_MIRROR_BOOTSTRAP="http://in.devel.hamaralinux.org/hamara"
+LB_PARENT_MIRROR_BOOTSTRAP="http://ftp.us.debian.org/debian"
 
 # $LB_PARENT_MIRROR_CHROOT: set parent mirror to fetch packages from
 # (Default: http://in.devel.hamaralinux.org/hamara)
-LB_PARENT_MIRROR_CHROOT="http://in.devel.hamaralinux.org/hamara"
+LB_PARENT_MIRROR_CHROOT="http://ftp.us.debian.org/debian"
 
 # $LB_PARENT_MIRROR_CHROOT_SECURITY: set security parent mirror to fetch packages from
 # (Default: http://security.debian.org/)
@@ -26,23 +27,23 @@ LB_PARENT_MIRROR_CHROOT_SECURITY="http://security.debian.org/"
 
 # $LB_PARENT_MIRROR_BINARY: set parent mirror which ends up in the image
 # (Default: http://in.devel.hamaralinux.org/hamara)
-LB_PARENT_MIRROR_BINARY="http://in.devel.hamaralinux.org/hamara"
+LB_PARENT_MIRROR_BINARY="http://ftp.us.debian.org/debian"
 
 # $LB_PARENT_MIRROR_BINARY_SECURITY: set security parent mirror which ends up in the image
 # (Default: http://in.devel.hamaralinux.org/hamara)
-LB_PARENT_MIRROR_BINARY_SECURITY="http://in.devel.hamaralinux.org/hamara"
+LB_PARENT_MIRROR_BINARY_SECURITY="http://security.debian.org"
 
 # $LB_PARENT_MIRROR_DEBIAN_INSTALLER: set debian-installer parent mirror
 # (Default: http://in.devel.hamaralinux.org/hamara)
-LB_PARENT_MIRROR_DEBIAN_INSTALLER="http://in.devel.hamaralinux.org/hamara"
+LB_PARENT_MIRROR_DEBIAN_INSTALLER="http://devel.hamaralinux.org/hamara"
 
 # $LB_MIRROR_BOOTSTRAP: set mirror to bootstrap from
 # (Default: http://in.devel.hamaralinux.org/hamara)
-LB_MIRROR_BOOTSTRAP="http://in.devel.hamaralinux.org/hamara"
+LB_MIRROR_BOOTSTRAP="http://ftp.us.debian.org/debian"
 
 # $LB_MIRROR_CHROOT: set mirror to fetch packages from
 # (Default: http://in.devel.hamaralinux.org/hamara)
-LB_MIRROR_CHROOT="http://in.devel.hamaralinux.org/hamara"
+LB_MIRROR_CHROOT="http://ftp.us.debian.org/debian"
 
 # $LB_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from
 # (Default: http://security.debian.org/)
@@ -50,7 +51,7 @@ LB_MIRROR_CHROOT_SECURITY="http://security.debian.org/"
 
 # $LB_MIRROR_BINARY: set mirror which ends up in the image
 # (Default: http://in.devel.hamaralinux.org/hamara)
-LB_MIRROR_BINARY="http://in.devel.hamaralinux.org/hamara"
+LB_MIRROR_BINARY="http://devel.hamaralinux.org/hamara"
 
 # $LB_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
 # (Default: http://security.debian.org/)
@@ -58,7 +59,7 @@ LB_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
 # $LB_MIRROR_DEBIAN_INSTALLER: set debian-installer mirror
 # (Default: http://in.devel.hamaralinux.org/hamara)
-LB_MIRROR_DEBIAN_INSTALLER="http://in.devel.hamaralinux.org/hamara"
+LB_MIRROR_DEBIAN_INSTALLER="http://devel.hamaralinux.org/hamara"
 
 # $LB_BOOTSTRAP_QEMU_ARCHITECTURES: architectures to use foreign bootstrap
 # (Default: )
@@ -71,3 +72,4 @@ LB_BOOTSTRAP_QEMU_EXCLUDE=""
 # $LB_BOOTSTRAP_QEMU_STATIC: static qemu binary for foreign bootstrap
 # (Default: )
 LB_BOOTSTRAP_QEMU_STATIC=""
+
diff --git a/config.d/hamara/config/chroot b/config.d/hamara/config/chroot
index ad373381c2ecfde2b667997c6a4905d6e4655cc9..ce14d75b023407c5622db34bafde1036f2f64ee1 100644
--- a/config.d/hamara/config/chroot
+++ b/config.d/hamara/config/chroot
@@ -14,7 +14,8 @@ LB_INTERACTIVE="false"
 
 # $LB_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LB_KEYRING_PACKAGES="hamara-keyring"
+#LB_KEYRING_PACKAGES="hamara-keyring"
+LB_KEYRING_PACKAGES="debian-keyring"
 
 # $LB_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
diff --git a/config.d/hamara/config/package-lists/additional.list.chroot b/config.d/hamara/config/package-lists/additional.list.chroot
index d1d51bc50017a7cbf183aa14b4657dd5b2728425..f7ba671753ea96134c5176d89c1f583283beeac3 100644
--- a/config.d/hamara/config/package-lists/additional.list.chroot
+++ b/config.d/hamara/config/package-lists/additional.list.chroot
@@ -1,6 +1,6 @@
 #Full Screen Support in VM
-virtualbox-guest-dkms
-virtualbox-guest-utils
+#virtualbox-guest-dkms
+#virtualbox-guest-utils
 #virtualbox-guest-x11
 
 aptitude
@@ -10,7 +10,7 @@ bluetooth
 brltty
 cheese
 cups
-firefox
+firefox-esr
 gparted
 gnome-disk-utility
 gnome-orca
diff --git a/data/hamara-sugam/lb_scripts/bootstrap_archives b/data/hamara-sugam/lb_scripts/bootstrap_archives
index 73c9ff08abdb7d87bcd9fd82ddafc25ac6b50f30..61b46fc089474bfa5990bc0ee551f0aba9487425 100755
--- a/data/hamara-sugam/lb_scripts/bootstrap_archives
+++ b/data/hamara-sugam/lb_scripts/bootstrap_archives
@@ -97,11 +97,11 @@ then
 					;;
 
 				*)
-					echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} stretch/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
+					echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} buster/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
 
 					if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 					then
-						echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} stretch/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
+						echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} buster/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
 					fi
 					;;
 			esac
diff --git a/data/hamara-sugam/lb_scripts/chroot_archives b/data/hamara-sugam/lb_scripts/chroot_archives
index d781da07c1cab29671dbfb67a5fae79b030c5624..8a2f94bc3f6e2d661a449b48bb9e40ecbe8a5f1d 100755
--- a/data/hamara-sugam/lb_scripts/chroot_archives
+++ b/data/hamara-sugam/lb_scripts/chroot_archives
@@ -98,11 +98,11 @@ EOF
 							;;
 
 						*)
-							echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} stretch/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
+							echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} buster/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
 
 							if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 							then
-								echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} stretch/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
+								echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} buster/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
 							fi
 							;;
 					esac
@@ -118,11 +118,11 @@ EOF
 					else
 						if [ "${LB_DERIVATIVE}" = "true" ]
 						then
-							echo "deb ${LB_MIRROR_CHROOT_SECURITY} stretch/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+							echo "deb ${LB_MIRROR_CHROOT_SECURITY} buster/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 
 							if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 							then
-								echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} stretch/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+								echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} buster/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 							fi
 						fi
 					fi
@@ -587,11 +587,11 @@ EOF
 							;;
 
 						*)
-							echo "deb ${LB_PARENT_MIRROR_BINARY_SECURITY} stretch/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
+							echo "deb ${LB_PARENT_MIRROR_BINARY_SECURITY} buster/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
 
 							if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 							then
-								echo "deb-src ${LB_PARENT_MIRROR_BINARY_SECURITY} stretch/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
+								echo "deb-src ${LB_PARENT_MIRROR_BINARY_SECURITY} buster/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
 							fi
 							;;
 					esac
@@ -607,11 +607,11 @@ EOF
 					else
 						if [ "${LB_DERIVATIVE}" = "true" ]
 						then
-							echo "deb ${LB_MIRROR_BINARY_SECURITY} stretch/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+							echo "deb ${LB_MIRROR_BINARY_SECURITY} buster/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 
 							if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 							then
-								echo "deb-src ${LB_MIRROR_BINARY_SECURITY} stretch/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+								echo "deb-src ${LB_MIRROR_BINARY_SECURITY} buster/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 							fi
 						fi
 					fi
diff --git a/data/hamara-sugam/lb_scripts/installer_debian-installer b/data/hamara-sugam/lb_scripts/installer_debian-installer
index cebab61a7a04e57a288032a3e788a4bbee24b47b..9b2ee46ae3bbff55e75e369bd09df23836765b69 100755
--- a/data/hamara-sugam/lb_scripts/installer_debian-installer
+++ b/data/hamara-sugam/lb_scripts/installer_debian-installer
@@ -269,7 +269,7 @@ case "${LB_DERIVATIVE}" in
 		then
 			# FIXME: normal derivatives probably don't rebuild d-i,
 			# but progress-linux does.
-			URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/stretch/main/installer-${LB_ARCHITECTURES}/current/images/"
+			URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/buster/main/installer-${LB_ARCHITECTURES}/current/images/"
 		fi
 		;;
 esac
diff --git a/data/hamara/lb_scripts/installer_debian-installer b/data/hamara/lb_scripts/installer_debian-installer
index 41985cd3a88f1161770cd0ea01a2f8a058a3f570..5778f5b7ac22cd337a7da125bd7975a2881095c1 100755
--- a/data/hamara/lb_scripts/installer_debian-installer
+++ b/data/hamara/lb_scripts/installer_debian-installer
@@ -488,7 +488,7 @@ then
 	# Generating deb indices
 	for _ARCHIVE_AREA in $(cd binary/pool && ls)
 	do
-		mkdir -p binary/dists/namaste/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}
+		mkdir -p binary/dists/svastik/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}
 
 		mv binary chroot/root
 		echo "cd /root/binary && apt-ftparchive packages pool/${_ARCHIVE_AREA} > dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}/Packages" > chroot/binary.sh
diff --git a/hamara-svastik.conf b/hamara-svastik.conf
index 31d36875943e3ffaa587da7ed2946f12100c61b7..8faa056d34180ecb9452a983e324c9c469a89afe 100755
--- a/hamara-svastik.conf
+++ b/hamara-svastik.conf
@@ -7,12 +7,12 @@ lb config --apt apt \
 		--bootloaders syslinux,grub-efi \
 		--compression gzip \
 		--debian-installer live \
-		--debian-installer-distribution svastik \
+		--debian-installer-distribution stretch \
 		--debian-installer-gui true \
 		--debootstrap-options "--keyring=/usr/share/keyrings/hamara-archive-keyring.gpg" \
 		--distribution svastik \
-		--parent-distribution svastik \
-		--parent-debian-installer-distribution svastik \
+		--parent-distribution stretch \
+		--parent-debian-installer-distribution stretch \
 		--firmware-binary true \
 		--firmware-chroot true \
 		--initramfs live-boot \
@@ -33,7 +33,7 @@ lb config --apt apt \
 		--parent-mirror-binary-updates http://ftp.us.debian.org/debian \
 		--parent-mirror-binary-backports http://ftp.us.debian.org/debian \
 		--parent-mirror-debian-installer http://ftp.us.debian.org/debian \
-		--mirror-bootstrap http://devel.hamaralinux.org/hamara \
+		--mirror-bootstrap http://ftp.us.debian.org/debian \
 		--mirror-chroot http://devel.hamaralinux.org/hamara \
 		--mirror-chroot-security http://security.debian.org \
 		--mirror-chroot-updates http://devel.hamaralinux.org/hamara \
diff --git a/mkbuild b/mkbuild
index 9778a69a9aa4d0a023da2c8d0a91d53c377dbced..a2d5645f6424520c724018a2b1fcc42d4334235d 100755
--- a/mkbuild
+++ b/mkbuild
@@ -24,6 +24,7 @@ SECONDS=0
 DATE=`date +%Y%m%d`
 
 SETUP(){
+	figlet SETUP
 	clear
 	cd $DIR
 	#Installing required packages
@@ -32,7 +33,7 @@ SETUP(){
 	echo " ###############################################"
 	echo " ----  Installing packages  ----  "
 
-	for PKG in apt-cacher-ng debootstrap live-build
+	for PKG in apt-cacher-ng debootstrap live-build figlet 
 	do
 	  dpkg -s $PKG &> /dev/null
 	  if [ $? -eq 1 ];then
@@ -41,7 +42,8 @@ SETUP(){
 	done
 
 	#Copying live build scripts
-	if [ $RELEASE == "hamara-sugam" ]; then
+	if [ $RELEASE == "hamara-sugam" ]
+	then
 		cp -rv data/hamara-sugam/lb_scripts/*  /usr/lib/live/build/
 		echo " [Done]  Copying scripts for Hamara Sugam "
 	else
@@ -51,7 +53,8 @@ SETUP(){
 
 
 	#Replacing bootloader config files
-	if [ $RELEASE == "hamara-sugam" ]; then
+	if [ $RELEASE == "hamara-sugam" ]
+	then
 		rm -rf /usr/share/live/build/bootloaders
 		cp -r data/hamara-sugam/bootloaders /usr/share/live/build
 	else
@@ -80,6 +83,7 @@ SETUP(){
 }
 
 CLEAN(){
+	figlet CLEAN
 	if [ -d "$DIR/build_area/$RELEASE-$ARCH" ]; then
 		#Change to target directory
 		cd $DIR/build_area/$RELEASE-$ARCH
@@ -93,6 +97,7 @@ CLEAN(){
 }
 
 BUILD(){
+	figlet BUILD
 	#creating build directory
 	mkdir -p $DIR/build_area/$RELEASE-$ARCH
 
@@ -110,7 +115,7 @@ BUILD(){
 
 	#Setting parameters
 	lb config --architectures $ARCH
-	lb config --backports true
+	lb config --backports false
 	lb config --security true
 	lb config --parent-mirror-bootstrap http://$MIRROR/hamara-sugam
 	lb config --parent-mirror-chroot http://$MIRROR/hamara-sugam
@@ -126,6 +131,7 @@ BUILD(){
 	lb config --mirror-binary-security http://security.debian.org/
 
 	echo  " ----  Starting build  ---- "
+	figlet STARTING BUILD
 	lb build
 	if [ $? -eq 0 ];then
 		echo "[Done]  ISO Build successfully for $ARCH architecture "
@@ -279,4 +285,4 @@ purge)
 	HELP
 	;;
 
-esac
\ No newline at end of file
+esac