diff --git a/config.d/hamara-sugam/config/binary b/config.d/hamara-sugam/config/binary
deleted file mode 100644
index 2bd789edb9ca512168435cdc48fdb76642b5e0f7..0000000000000000000000000000000000000000
--- a/config.d/hamara-sugam/config/binary
+++ /dev/null
@@ -1,158 +0,0 @@
-# config/binary - options for live-build(7), binary stage
-
-# $LB_BINARY_FILESYSTEM: set image filesystem
-# (Default: fat32)
-LB_BINARY_FILESYSTEM="fat32"
-
-# $LB_APT_INDICES: set apt/aptitude generic indices
-# (Default: true)
-LB_APT_INDICES="true"
-
-# $LB_BOOTAPPEND_LIVE: set boot parameters
-# (Default: empty)
-LB_BOOTAPPEND_LIVE="boot=live components quiet "
-
-# $LB_BOOTAPPEND_INSTALL: set boot parameters
-# (Default: empty)
-LB_BOOTAPPEND_INSTALL=""
-
-# $LB_BOOTAPPEND_LIVE_FAILSAFE: set boot parameters
-# (Default: empty)
-LB_BOOTAPPEND_LIVE_FAILSAFE="boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal"
-
-# $LB_BOOTLOADERS: set bootloaders
-# (Default: grub-pc)
-LB_BOOTLOADERS="syslinux,grub-efi"
-
-# $LB_CHECKSUMS: set checksums
-# (Default: md5)
-LB_CHECKSUMS="md5"
-
-# $LB_COMPRESSION: set compression
-# (Default: none)
-LB_COMPRESSION="gzip"
-
-# $LB_ZSYNC: set zsync
-# (Default: false)
-LB_ZSYNC="false"
-
-# ${LB_BUILD_WITH_CHROOT: control if we build binary images chrooted
-# (Default: true)
-# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to false.
-LB_BUILD_WITH_CHROOT="true"
-
-# $LB_DEBIAN_INSTALLER: set debian-installer
-# (Default: true)
-LB_DEBIAN_INSTALLER="live"
-
-# $LB_DEBIAN_INSTALLER_DISTRIBUTION: set debian-installer suite
-# (Default: empty)
-LB_DEBIAN_INSTALLER_DISTRIBUTION="namaste"
-
-# $LB_DEBIAN_INSTALLER_PRESEEDFILE: set debian-installer preseed filename/url
-# (Default: )
-LB_DEBIAN_INSTALLER_PRESEEDFILE=""
-
-# $LB_DEBIAN_INSTALLER_GUI: toggle use of GUI debian-installer
-# (Default: true)
-LB_DEBIAN_INSTALLER_GUI="true"
-
-# $LB_GRUB_SPLASH: set custom grub splash
-# (Default: empty)
-LB_GRUB_SPLASH=""
-
-# $LB_HDD_LABEL: set hdd label
-# (Default: DEBIAN_LIVE)
-LB_HDD_LABEL="HAMARA_SUGAM_LIVE"
-
-# $LB_HDD_SIZE: set hdd filesystem size
-# (Default: auto)
-LB_HDD_SIZE="auto"
-
-# $LB_HDD_PARTITION_START: set start of partition for the hdd target for BIOSes that expect a specific boot partition start (e.g. "63s"). If empty, use optimal layout.
-# (Default: )
-LB_HDD_PARTITION_START=""
-
-# $LB_ISO_APPLICATION: set iso author
-# (Default: Debian Live)
-LB_ISO_APPLICATION="Hamara Sugam Live"
-
-# $LB_ISO_PREPARER: set iso preparer
-# (Default: live-build 1:20161216; http://live-systems.org/devel/live-build)
-LB_ISO_PREPARER="live-build 1:20161216; http://live-systems.org/devel/live-build"
-
-# $LB_ISO_PUBLISHER: set iso publisher
-# (Default: Live Systems project; http://live-systems.org/; debian-live@lists.debian.org)
-LB_ISO_PUBLISHER="Live Systems project; http://live-systems.org/; debian-live@lists.debian.org"
-
-# $LB_ISO_VOLUME: set iso volume (max 32 chars)
-# (Default: Debian stretch 20170104-14:07)
-LB_ISO_VOLUME="Hamara Sugam namaste 20170104"
-
-# $LB_JFFS2_ERASEBLOCK: set jffs2 eraseblock size
-# (Default: unset)
-LB_JFFS2_ERASEBLOCK=""
-
-# $LB_MEMTEST: set memtest
-# (Default: none)
-LB_MEMTEST=""
-
-# $LB_LOADLIN: set loadlin
-# (Default: false)
-LB_LOADLIN="false"
-
-# $LB_WIN32_LOADER: set win32-loader
-# (Default: false)
-LB_WIN32_LOADER="false"
-
-# $LB_NET_ROOT_FILESYSTEM: set netboot filesystem
-# (Default: nfs)
-LB_NET_ROOT_FILESYSTEM="nfs"
-
-# $LB_NET_ROOT_MOUNTOPTIONS: set nfsopts
-# (Default: empty)
-LB_NET_ROOT_MOUNTOPTIONS=""
-
-# $LB_NET_ROOT_PATH: set netboot server directory
-# (Default: /srv/debian-live)
-LB_NET_ROOT_PATH="/srv/debian-live"
-
-# $LB_NET_ROOT_SERVER: set netboot server address
-# (Default: 192.168.1.1)
-LB_NET_ROOT_SERVER="192.168.1.1"
-
-# $LB_NET_COW_FILESYSTEM: set net client cow filesystem
-# (Default: nfs)
-LB_NET_COW_FILESYSTEM="nfs"
-
-# $LB_NET_COW_MOUNTOPTIONS: set cow mount options
-# (Default: empty)
-LB_NET_COW_MOUNTOPTIONS=""
-
-# $LB_NET_COW_PATH: set cow directory
-# (Default: )
-LB_NET_COW_PATH=""
-
-# $LB_NET_COW_SERVER: set cow server
-# (Default: )
-LB_NET_COW_SERVER=""
-
-# $LB_NET_TARBALL: set net tarball
-# (Default: true)
-LB_NET_TARBALL="true"
-
-# $LB_FIRMWARE_BINARY: include firmware packages in debian-installer
-# (Default: true)
-LB_FIRMWARE_BINARY="true"
-
-# $LB_FIRMWARE_CHROOT: include firmware packages in debian-installer
-# (Default: true)
-LB_FIRMWARE_CHROOT="true"
-
-# $LB_SWAP_FILE_PATH: set swap file path
-# (Default: )
-LB_SWAP_FILE_PATH=""
-
-# $LB_SWAP_FILE_SIZE: set swap file size
-# (Default: 512)
-LB_SWAP_FILE_SIZE="512"
\ No newline at end of file
diff --git a/config.d/hamara-sugam/config/bootstrap b/config.d/hamara-sugam/config/bootstrap
deleted file mode 100644
index 25e119bf3a0dfc1938a265f1556a69c1ccc0f97f..0000000000000000000000000000000000000000
--- a/config.d/hamara-sugam/config/bootstrap
+++ /dev/null
@@ -1,73 +0,0 @@
-# config/bootstrap - options for live-build(7), bootstrap stage
-
-# $LB_DISTRIBUTION: select distribution to use
-# (Default: namaste)
-LB_DISTRIBUTION="namaste"
-
-# $LB_PARENT_DISTRIBUTION: select parent distribution to use
-# (Default: namaste)
-LB_PARENT_DISTRIBUTION="namaste"
-
-# $LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION: select parent distribution for debian-installer to use
-# (Default: 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"
-
-# $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"
-
-# $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"
-
-# $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"
-
-# $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"
-
-# $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"
-
-# $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"
-
-# $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"
-
-# $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"
-
-# $LB_BOOTSTRAP_QEMU_ARCHITECTURES: architectures to use foreign bootstrap
-# (Default: )
-LB_BOOTSTRAP_QEMU_ARCHITECTURES=""
-
-# $LB_BOOTSTRAP_QEMU_EXCLUDE: packages to exclude during foreign bootstrap
-# (Default: )
-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-sugam/config/build b/config.d/hamara-sugam/config/build
deleted file mode 100644
index 3418af1664d98558e783a37ae01cfb22f22c9ac4..0000000000000000000000000000000000000000
--- a/config.d/hamara-sugam/config/build
+++ /dev/null
@@ -1,10 +0,0 @@
-[Image]
-Architecture: amd64
-Archive-Areas: main contrib non-free
-Distribution: namaste
-Mirror-Bootstrap: http://devel.hamaralinux.org/hamara-sugam
-
-[FIXME]
-Configuration-Version: 1:20161216
-Name: hamara-sugam-live
-Type: iso-hybrid
diff --git a/config.d/hamara-sugam/config/chroot b/config.d/hamara-sugam/config/chroot
deleted file mode 100644
index 0338294b8b82adcf91f0fa6e67a4d47d3e8375d5..0000000000000000000000000000000000000000
--- a/config.d/hamara-sugam/config/chroot
+++ /dev/null
@@ -1,37 +0,0 @@
-# config/chroot - options for live-build(7), chroot stage
-
-# $LB_CHROOT_FILESYSTEM: set chroot filesystem
-# (Default: squashfs)
-LB_CHROOT_FILESYSTEM="squashfs"
-
-# $LB_UNION_FILESYSTEM: set union filesystem
-# (Default: overlay)
-LB_UNION_FILESYSTEM="overlay"
-
-# $LB_INTERACTIVE: set interactive build
-# (Default: false)
-LB_INTERACTIVE="false"
-
-# $LB_KEYRING_PACKAGES: set keyring packages
-# (Default: empty)
-LB_KEYRING_PACKAGES="hamara-keyring"
-
-# $LB_LINUX_FLAVOURS: set kernel flavour to use
-# (Default: autodetected)
-LB_LINUX_FLAVOURS="amd64"
-
-# $LB_LINUX_PACKAGES: set kernel packages to use
-# (Default: autodetected)
-LB_LINUX_PACKAGES="linux-image"
-
-# $LB_SECURITY: enable security updates
-# (Default: false)
-LB_SECURITY="false"
-
-# $LB_UPDATES: enable updates updates
-# (Default: false)
-LB_UPDATES="false"
-
-# $LB_BACKPORTS: enable backports updates
-# (Default: false)
-LB_BACKPORTS="false"
diff --git a/config.d/hamara-sugam/config/common b/config.d/hamara-sugam/config/common
deleted file mode 100644
index b7d56a7e3be690059d809486aca4649230e964b7..0000000000000000000000000000000000000000
--- a/config.d/hamara-sugam/config/common
+++ /dev/null
@@ -1,119 +0,0 @@
-# config/common - common options for live-build(7)
-
-# $LB_APT: set package manager
-# (Default: apt)
-LB_APT="apt"
-
-# $LB_APT_FTP_PROXY: set apt/aptitude ftp proxy
-# (Default: autodetected or empty)
-LB_APT_FTP_PROXY=""
-
-# $LB_APT_HTTP_PROXY: set apt/aptitude http proxy
-# (Default: autodetected or empty)
-LB_APT_HTTP_PROXY=""
-
-# $LB_APT_PIPELINE: set apt/aptitude pipeline depth
-# (Default: )
-LB_APT_PIPELINE=""
-
-# $LB_APT_RECOMMENDS: set apt/aptitude recommends
-# (Default: true)
-LB_APT_RECOMMENDS="true"
-
-# $LB_APT_SECURE: set apt/aptitude security
-# (Default: true)
-LB_APT_SECURE="true"
-
-# $LB_APT_SOURCE_ARCHIVES: set apt/aptitude source entries in sources.list
-# (Default: true)
-LB_APT_SOURCE_ARCHIVES="false"
-
-# $LB_CACHE: control cache
-# (Default: true)
-LB_CACHE="true"
-
-# $LB_CACHE_INDICES: control if downloaded package indices should be cached
-# (Default: false)
-LB_CACHE_INDICES="false"
-
-# $LB_CACHE_PACKAGES: control if downloaded packages files should be cached
-# (Default: true)
-LB_CACHE_PACKAGES="true"
-
-# $LB_CACHE_STAGES: control if completed stages should be cached
-# (Default: bootstrap)
-LB_CACHE_STAGES="bootstrap"
-
-# $LB_DEBCONF_FRONTEND: set debconf(1) frontend to use
-# (Default: noninteractive)
-LB_DEBCONF_FRONTEND="noninteractive"
-
-# $LB_DEBCONF_PRIORITY: set debconf(1) priority to use
-# (Default: critical)
-LB_DEBCONF_PRIORITY="critical"
-
-# $LB_INITRAMFS: set initramfs hook
-# (Default: live-boot)
-LB_INITRAMFS="live-boot"
-
-# $LB_INITRAMFS_COMPRESSION: set initramfs compression
-# (Default: gzip)
-LB_INITRAMFS_COMPRESSION="gzip"
-
-# $LB_INITSYSTEM: set init system
-# (Default: systemd)
-LB_INITSYSTEM="systemd"
-
-# $LB_FDISK: set fdisk program
-# (Default: autodetected)
-LB_FDISK="fdisk"
-
-# $LB_LOSETUP: set losetup program
-# (Default: autodetected)
-LB_LOSETUP="losetup"
-
-# $LB_MODE: set distribution mode
-# (Default: debian)
-LB_MODE="debian"
-
-# $LB_SYSTEM: set system type
-# (Default: live)
-LB_SYSTEM="live"
-
-# $LB_TASKSEL: set tasksel program
-# (Default: apt)
-LB_TASKSEL="apt"
-
-# live-build options
-
-# $_BREAKPOINTS: enable breakpoints
-# (Default: false)
-#_BREAKPOINTS="false"
-
-# $_DEBUG: enable debug
-# (Default: false)
-#_DEBUG="false"
-
-# $_COLOR: enable color
-# (Default: false)
-#_COLOR="false"
-
-# $_FORCE: enable force
-# (Default: false)
-#_FORCE="false"
-
-# $_QUIET: enable quiet
-# (Default: false)
-_QUIET="false"
-
-# $_VERBOSE: enable verbose
-# (Default: false)
-#_VERBOSE="false"
-
-# Internal stuff (FIXME)
-APT_OPTIONS="--yes"
-APTITUDE_OPTIONS="--assume-yes"
-DEBOOTSTRAP_OPTIONS="--no-check-gpg"
-DEBOOTSTRAP_SCRIPT=""
-GZIP_OPTIONS="-6  --rsyncable"
-ISOHYBRID_OPTIONS=""
diff --git a/config.d/hamara-sugam/config/hooks/live/0090-get-cala.hook.chroot b/config.d/hamara-sugam/config/hooks/live/0090-get-cala.hook.chroot
deleted file mode 100755
index 49c706c8101fd5950fc3da7aba3a4f6382d1b720..0000000000000000000000000000000000000000
--- a/config.d/hamara-sugam/config/hooks/live/0090-get-cala.hook.chroot
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-echo "deb http://ftp.uk.debian.org/debian unstable main" > /etc/apt/sources.list.d/unstable.list
-apt update
-apt install -y calamares calamares-settings-hamara
-rm /etc/apt/sources.list.d/unstable.list
-apt update
-
-#reconfigure hamara-live
-dpkg-reconfigure hamara-live
-apt -y autoremove
diff --git a/config.d/hamara-sugam/config/includes.chroot/usr/share/applications/mate-calc.desktop b/config.d/hamara-sugam/config/includes.chroot/usr/share/applications/mate-calc.desktop
new file mode 100644
index 0000000000000000000000000000000000000000..db94898fa62ea55be2ffb02f44e1e44e7b452ab4
--- /dev/null
+++ b/config.d/hamara-sugam/config/includes.chroot/usr/share/applications/mate-calc.desktop
@@ -0,0 +1,242 @@
+[Desktop Entry]
+Name= Calculator
+Name[am]=የ ሜት መደመሪያ 
+Name[ar]=حاسبة متّة
+Name[ast]=Calculadora 
+Name[be]=Калькулятар 
+Name[bg]= Калкулатор
+Name[ca]=Calculadora de 
+Name[ca@valencia]=Calculadora del 
+Name[cmn]= 計算機
+Name[cs]= Kalkulačka
+Name[da]=lommeregner
+Name[de]=Taschenrechner
+Name[el]=Αριθμομηχανή 
+Name[en_AU]= Calculator
+Name[en_GB]= Calculator
+Name[eo]= Kalkulilo
+Name[es]=Calculadora de 
+Name[et]= kalkulaator
+Name[eu]= kalkulagailua
+Name[fa]=ماشین حساب 
+Name[fi]= Laskin
+Name[fr]=Calculatrice de 
+Name[gl]=Calculadora 
+Name[gu]=મેટ કૅલ્ક્યુલેટર
+Name[he]=המחשבון של 
+Name[hi]=माटे कैल्क्यलेटर
+Name[hr]= kalkulator
+Name[hu]= számológép
+Name[hy]= Հաշվիչ
+Name[id]= Calculator
+Name[it]=Calcolatrice di 
+Name[ja]= 電卓
+Name[kk]= калькуляторы
+Name[km]=ម៉ាស៊ីនគិតលេខ 
+Name[kn]=ಮೇಟ್ ಕ್ಯಾಲ್ಕುಲೇಟರ್
+Name[ko]=마테 계산기 
+Name[ku_IQ]=ژمێرەری 
+Name[ky]= калькулятору
+Name[lt]= skaičiuotuvas
+Name[lv]= Kalkulators
+Name[mr]=मेट गणनयंत्र
+Name[ms]=Kalkulator 
+Name[nb]=kalkulator
+Name[nl]= Rekenmachine
+Name[pl]=Kalkulator 
+Name[pt]=Calculadora 
+Name[pt_BR]=Calculadora do 
+Name[ro]=Calculator 
+Name[ru]=Калькулятор 
+Name[sk]= kalkulačka
+Name[sl]=Računalo 
+Name[sq]= Llogaritës
+Name[sr]=Мејтов дигитрон
+Name[sv]= Kalkylatorn
+Name[ta]= கணிப்பான்
+Name[th]=เครื่องคิดเลข 
+Name[tr]= Hesap Makinesi
+Name[uk]=Рахівник 
+Name[uz]= Kalkulyator
+Name[zh_CN]= 计算器
+Name[zh_HK]= 計數機
+Name[zh_TW]= 計算機
+GenericName=Calculator
+GenericName[af]=Sakrekenaar
+GenericName[am]=መደመሪያ 
+GenericName[ar]=الحاسِبة
+GenericName[as]=গণক
+GenericName[ast]=Calculadora
+GenericName[az]=Hesaplayıcı
+GenericName[be]=Калькулятар
+GenericName[bg]=Калкулатор
+GenericName[bn]=ক্যালকুলেটর
+GenericName[bn_IN]=ক্যালকুলেটর
+GenericName[bs]=Računalo
+GenericName[ca]=Calculadora
+GenericName[ca@valencia]=Calculadora
+GenericName[cmn]=計算機
+GenericName[cs]=Kalkulačka
+GenericName[cy]=Cyfrifiannell
+GenericName[da]=Lommeregner
+GenericName[de]=Taschenrechner
+GenericName[dz]=རྩིས་འཕྲུལ།
+GenericName[el]=Αριθμομηχανή
+GenericName[en_AU]=Calculator
+GenericName[en_CA]=Calculator
+GenericName[en_GB]=Calculator
+GenericName[eo]=Kalkulilo
+GenericName[es]=Calculadora
+GenericName[es_AR]=Calculadora
+GenericName[et]=Kalkulaator
+GenericName[eu]=Kalkulagailua
+GenericName[fa]=ماشین‌حساب
+GenericName[fi]=Laskin
+GenericName[fr]=Calculatrice
+GenericName[ga]=Áireamhán
+GenericName[gl]=Calculadora
+GenericName[gu]=કૅલ્ક્યુલેટર
+GenericName[he]=מחשבון
+GenericName[hi]=गणक
+GenericName[hr]=Kalkulator
+GenericName[hu]=Számológép
+GenericName[hy]=Հաշվիչ
+GenericName[id]=Kalkulator
+GenericName[it]=Calcolatrice
+GenericName[ja]=電卓
+GenericName[ka]=კალკულატორი
+GenericName[kk]=Калькулятор
+GenericName[km]=ម៉ាស៊ីន​គិត​លេខ
+GenericName[kn]=ಕ್ಯಾಲ್ಕುಲೇಟರ್
+GenericName[ko]=계산기
+GenericName[ku_IQ]=ژمێرەر
+GenericName[ky]=Калькулятор
+GenericName[lt]=Skaičiuotuvas
+GenericName[lv]=Kalkulators
+GenericName[mai]=कैलकुलेटर
+GenericName[mg]=Milina mpikajy
+GenericName[mk]=Калкулатор
+GenericName[ml]=ഗണനി
+GenericName[mn]=Тооны машин
+GenericName[mr]=गणनयंत्र
+GenericName[ms]=Kalkulator
+GenericName[my]=ဂဏန်းတွက်စက်
+GenericName[nb]=Kalkulator
+GenericName[ne]=गणकयन्त्र
+GenericName[nl]=Rekenmachine
+GenericName[nn]=Kalkulator
+GenericName[oc]=Calculadoira
+GenericName[or]=କାଲକୁଲେଟର
+GenericName[pa]=ਕੈਲਕੂਲੇਟਰ
+GenericName[pl]=Kalkulator
+GenericName[pt]=Calculadora
+GenericName[pt_BR]=Calculadora
+GenericName[ro]=Calculator
+GenericName[ru]=Калькулятор
+GenericName[si]=ගණකය
+GenericName[sk]=Kalkulačka
+GenericName[sl]=Računalo
+GenericName[sq]=Makinë llogaritëse
+GenericName[sr]=Дигитрон
+GenericName[sr@latin]=Kalkulator
+GenericName[sv]=Kalkylator
+GenericName[ta]=கணிப்பான்
+GenericName[te]=గణన పరికరం
+GenericName[th]=เครื่องคิดเลข
+GenericName[tk]=Çot
+GenericName[tr]=Hesap Makinesi
+GenericName[ug]=ھېسابلىغۇچ
+GenericName[uk]=Рахівник
+GenericName[uz]=Kalkulyator
+GenericName[vi]=Bàn tính
+GenericName[xh]=Ikhaltyuleyitha
+GenericName[zh_CN]=计算器
+GenericName[zh_HK]=計數機
+GenericName[zh_TW]=計算機
+Comment=Perform arithmetic, scientific or financial calculations
+Comment[af]=Voer rekenkundige, wetenskaplike of finansiële berekeninge uit
+Comment[ar]=أجرِ حساباتك الرّياضية و العلمية و الاقتصادية
+Comment[as]=গণিতিক, বিজ্ঞানভিত্তিক অথবা আৰ্থিক গণনাসমূহ কৰক
+Comment[ast]=Fai cálculos aritméticos, científicos o financieros
+Comment[be]=Арыфметычныя, навуковыя і фінансавыя разлікі
+Comment[bg]=Извършване на аритметични, научни или финансови изчисления
+Comment[bn]=গাণিতিক, বৈজ্ঞানিক অথবা অর্থনৈতিক গণনা সম্পাদন করা হবে
+Comment[bn_IN]=গণিত, বৈজ্ঞানিক অথবা অর্থনৈতিক প্রণালী করুন
+Comment[ca]=Realitzeu càlculs aritmètics, científics o financers
+Comment[ca@valencia]=Realitza càlculs aritmètics, científics o financers
+Comment[cmn]=進列數字、科學或金融的計算
+Comment[cs]=Provádí aritmetické, vědecké i finanční výpočty
+Comment[da]=Udfør aritmetiske, videnskabelige eller finansielle udregninger
+Comment[de]=Arithmetische, wissenschaftliche und finanztechnische Berechnungen durchführen
+Comment[dz]=མཚན་རིགས་ དངུལ་འབྲེལ་ ཡང་ན་ ཨང་རྩིས་ཀྱི་ རྩིས་ལས་ཀྱི་ ལས་འགན་བསྒྲུབ་ 
+Comment[el]=Εκτελεί αριθμητικούς, επιστημονικούς ή εμπορικούς υπολογισμούς
+Comment[en_AU]=Perform arithmetic, scientific or financial calculations
+Comment[en_CA]=Perform arithmetic, scientific or financial calculations
+Comment[en_GB]=Perform arithmetic, scientific or financial calculations
+Comment[eo]=Fari aritmetikajn, sciencajn aŭ financajn kalkulojn
+Comment[es]=Realice cálculos aritméticos, científicos o financieros
+Comment[et]=Aritmeetilised, teaduslikud ja finantsarvutused
+Comment[eu]=Egin kalkulu aritmetikoak, zientifikoak edo finantzarioak
+Comment[fa]=انجام محاسبات ریاضی، علمی و مالی
+Comment[fi]=Suorita aritmeettisia, tieteellisiä tai talouslaskutoimituksia
+Comment[fr]=Effectue des calculs arithmétiques, scientifiques ou financiers
+Comment[gl]=Faga cálculos aritméticos, científicos ou financeiros
+Comment[gu]=ગાણિતીક, વૈજ્ઞાનિક અથવા આર્થિક ગણતરીઓ કરો
+Comment[he]=ביצוע חישובים פשוטים, מדעיים וכלכליים.
+Comment[hi]=अंकगणित, वैज्ञानिक, या वित्तीय गणना करें
+Comment[hu]=Aritmetikai, tudományos vagy pénzügyi számítások végrehajtása
+Comment[hy]=Կատարել թվաբանական, գիտական կամ ֆինանսական հաշվարկներ
+Comment[id]=Lakukan perhitungan aritmetik, ilmiah, atau finansial
+Comment[it]=Esegue calcoli aritmetici, scientifici o finanziari
+Comment[ja]=算術/科学/財務の計算を行います
+Comment[kk]=Қарапайым, ғылыми не қаржылық есептеулерді жүргізу.
+Comment[km]=អនុវត្ត​ការ​គណនា​គណិតវិទ្យា វិទ្យាសាស្ត្រ ឬ​ហិរញ្ញវត្ថុ
+Comment[kn]=ಗಣಿತ, ವೈಜ್ಞಾನಿಕ ಅಥವಾ ಹಣಕಾಸಿನ ಲೆಕ್ಕಚಾರಗಳನ್ನು ಮಾಡಿ
+Comment[ko]=일반 연산, 과학, 재무용 계산을 합니다
+Comment[lt]=Atlikti aritmetinius, mokslinius ar finansinius skaičiavimus
+Comment[lv]=Veikt aritmētiskus, zinātniskus vai finansiālus aprēķinus
+Comment[mk]=Извршете аритметички, научни или финансиски пресметки
+Comment[ml]=അരിതമെറ്റിക്, ശാസ്ത്രീയം അല്ലെങ്കില്‍ ധനകാര്യ സംബന്ധമായ കണക്കുകൂട്ടലുകള്‍ നടത്തുക
+Comment[mr]=अंकगणित, शास्त्रीय किंवा वित्तीय गणना चालवून पहा
+Comment[ms]=Lakukan pengiraan aritmetik, saintifik atau kewangan
+Comment[nb]=Utfør aritmetiske, vitenskapelige eller finansielle utregninger
+Comment[ne]=अंकगणितीय, वैज्ञानिक वा आर्थिक गणनाहरू कार्यसम्पादन गर्नुहोस्
+Comment[nl]=Rekenkundige, wetenschappelijke of financiële berekeningen uitvoeren
+Comment[nn]=Utfør aritmetiske, vitskaplege eller finansielle utregningar
+Comment[oc]=Effectue de calculs aritmetics, scientifics o financièrs
+Comment[or]=ଗାଣିତିକ,ବୈଜ୍ଞାନିକ କିମ୍ବା ଆର୍ଥିକ ହିସାବ କରନ୍ତୁ
+Comment[pa]=ਗਣਿਤ, ਵਿਗਿਆਨਕ ਜਾਂ ਵਿੱਤੀ ਗਣਨਾ ਕਰੋ
+Comment[pl]=Wykonanie obliczeń arytmetycznych, naukowych lub finansowych
+Comment[pt]=Realize cálculos aritméticos, científicos ou financeiros
+Comment[pt_BR]=Efetue cálculos aritméticos, científicos ou financeiros
+Comment[ro]=Efectuează calcule aritmetice, științifice și financiare
+Comment[ru]=Вычисления: арифметические, научные и финансовые
+Comment[sk]=Vykonávanie aritmetických, vedeckých alebo finančných výpočtov
+Comment[sl]=Izvajanje aritmetičnih, znanstvenih ali finančnih izračunov
+Comment[sq]=Kryen llogari aritmetikore, shkencore ose financiare
+Comment[sr]=Извршавајте аритметичке, научне или финансијске прорачуне
+Comment[sr@latin]=Izvršite aritmetičke, naučne ili finansijske proračune
+Comment[sv]=Utför aritmetiska, vetenskapliga eller finansiella beräkningar
+Comment[ta]=கணித, அறிவியல் அல்லது பொருளாதார கணக்குகளை செய்கிறது.
+Comment[te]=బీజీయ, శాస్త్రీయ లేదా ఆర్ధిక గణనలను ప్రదర్శించు
+Comment[th]=คำนวณเลขคณิต ฟังก์ชันวิทยาศาสตร์ หรือการเงิน
+Comment[tr]=Aritmetik, bilimsel ve finansal hesaplamalar gerçekleştirir
+Comment[ug]=ئارىفمېتىكىلىق، ئىلمىي ياكى ئىقتىسادىي ھېساباتلارنى ئېلىپ بېرىش پروگراممىسى
+Comment[uk]=Виконання арифметичних, наукових або фінансових розрахунків
+Comment[uz]=Arifmetik, ilmiy yoki moliyaviy hisoblashlarni bajaring
+Comment[vi]=Chạy phép tính kiểu số học, khoa học hay tài chính
+Comment[zh_CN]=执行算术、科学或财务计算
+Comment[zh_HK]=進行數字、科學或金融的計算
+Comment[zh_TW]=進行數字、科學或金融的計算
+Exec=mate-calc
+Icon=accessories-calculator
+Terminal=false
+Type=Application
+StartupNotify=true
+Keywords=calculator,MATE,scientifc,arithmetic,financial,calculations
+Categories=GTK;Utility;Calculator;
+X-MATE-DocPath=mate-calc/mate-calc.xml
+X-MATE-Bugzilla-Bugzilla=MATE
+X-MATE-Bugzilla-Product=mate-calc
+X-MATE-Bugzilla-Component=general
+X-MATE-Bugzilla-OtherBinaries=mate-calculator
diff --git a/config.d/hamara-sugam/config/includes.chroot/usr/share/applications/mate-font-viewer.desktop b/config.d/hamara-sugam/config/includes.chroot/usr/share/applications/mate-font-viewer.desktop
new file mode 100644
index 0000000000000000000000000000000000000000..cc375e12a0b1c022989cfbed9b8b88d9d2a2bec8
--- /dev/null
+++ b/config.d/hamara-sugam/config/includes.chroot/usr/share/applications/mate-font-viewer.desktop
@@ -0,0 +1,88 @@
+[Desktop Entry]
+Name=Font Viewer
+Name[am]=የ ሜት ፊደል መመልከቻ
+Name[bg]=Преглед на шрифтове
+Name[ca]=Visualitzador de lletres de 
+Name[ca@valencia]=Visualitzador de tipus de lletra del 
+Name[cs]=Prohlížeč písem 
+Name[da]= - skrifttypefremviser
+Name[de]=-Schriftanzeiger
+Name[el]=Εφαρμογή προβολής γραμματοσειρών ΜΑΤΕ
+Name[en_GB]= Font Viewer
+Name[es]=Visor de fuentes de 
+Name[fi]= Fonttikatselin
+Name[fr]=Visionneur de police 
+Name[hr]= preglednik fontova
+Name[hu]= Betűkészlet-megjelenítő
+Name[id]=Penampil Fonta 
+Name[it]=Visualizzatore di caratteri 
+Name[ja]= フォントビューアー
+Name[kk]= қаріптер көрсетушісі
+Name[ko]=마테 글꼴 보기
+Name[lt]= šriftų žiūryklė
+Name[ms]=Pelihat Fon 
+Name[nb]= skriftviser
+Name[nl]= Lettertypeweergave
+Name[pl]=Przeglądarka czcionek 
+Name[pt]=Visualizador de Fontes do 
+Name[pt_BR]=Visualizador de Fontes do 
+Name[ro]=Vizualizator de fonturi 
+Name[ru]=Программа просмотра шрифтов 
+Name[sk]=Prehliadač písiem 
+Name[sl]=Pregledovalnik pisav 
+Name[sr]=Мејтов прегледач фонтова
+Name[sv]= Typsnittsvisare
+Name[tr]= Yazıtipi Görüntüleyicisi
+Name[uk]=Проґрама перегляду шрифтів МАТЕ
+Name[zh_CN]= 字体查看器
+Name[zh_TW]= 字型檢視器
+Comment=View fonts on your system
+Comment[am]=በ እርስዎ ስርአት ላይ ፊደሎች መመልከቻ
+Comment[bg]=Преглед на шрифтовете в системата
+Comment[ca]=Visualitzeu les lletres del vostre sistema
+Comment[ca@valencia]=Visualitzeu els tipus de lletra del sistema
+Comment[cs]=Zobrazte si písma ve svém systému
+Comment[da]=Vis skrifttyper på dit system
+Comment[de]=Schriften auf Ihrem System anzeigen
+Comment[el]=Δείτε τις γραμματοσειρές του συστήματος σας
+Comment[en_GB]=View fonts on your system
+Comment[es]=Ver las fuentes en su sistema
+Comment[fi]=Näytä järjestelmän fontit
+Comment[fr]=Affiche les polices de votre système
+Comment[hr]=Pogledajte fontove u svom sustavu
+Comment[hu]=A rendszer betűkészleteinek megtekintése
+Comment[id]=Tilik fonta pada sistem Anda
+Comment[it]=Visualizza caratteri nel tuo sistema
+Comment[ja]=システム内にあるフォントを表示します
+Comment[kk]=Жүйеңіздегі қаріптерді қарау
+Comment[ko]=시스템에서 글꼴 보기
+Comment[lt]=Žiūrėti šriftus jūsų sistemoje
+Comment[ms]=Lihat fon dalam sistem anda
+Comment[nb]=Vis skrifter på ditt system
+Comment[nl]=Bekijk de lettertypes op uw systeem
+Comment[pl]=Wyświetl zainstalowane czcionki
+Comment[pt]=Ver tipos de letra no seu sistema
+Comment[pt_BR]=Ver as fontes no seu sistema
+Comment[ro]=Arată fonturile de pe sistem
+Comment[ru]=Просмотр установленных в систему шрифтов
+Comment[sk]=Zobrazuje písma vášho systému
+Comment[sl]=Ogled pisav v sistemu
+Comment[sr]=Прегледајте фонтове на вашем систему
+Comment[sv]=Visa typsnitt på ditt system
+Comment[tr]=Sisteminizdeki yazıtiplerini görüntüleyin
+Comment[uk]=Перегляд шрифтів у Вашій системі  
+Comment[zh_CN]=在您的系统上查看字体
+Comment[zh_TW]=在您的系統上檢視字型
+Icon=preferences-desktop-font
+Exec=mate-font-viewer %u
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=GTK;Utility;
+MimeType=application/x-font-ttf;application/x-font-pcf;application/x-font-type1;application/x-font-otf;
+Keywords=mate-control-center;MATE;font;viewer;preview;desktop;preferences;
+X-MATE-Bugzilla-Bugzilla=MATE
+X-MATE-Bugzilla-Product=gnome-font-viewer
+X-MATE-Bugzilla-Component=general
+X-MATE-Bugzilla-OtherBinaries=gnome-thumbnail-font
+X-MATE-Bugzilla-Version=1.20.0
diff --git a/config.d/hamara-sugam/config/includes.installer/preseed.cfg b/config.d/hamara-sugam/config/includes.installer/preseed.cfg
deleted file mode 100644
index 71a7fb665457380c4bbfbce89cf15783f3ad0ad2..0000000000000000000000000000000000000000
--- a/config.d/hamara-sugam/config/includes.installer/preseed.cfg
+++ /dev/null
@@ -1,32 +0,0 @@
-#Skip network config
-d-i netcfg/enable boolean false
-
-#load non-free firmware
-d-i hw-detect/load_firmware boolean true
-
-
-# Clock and time zone setup
-d-i clock-setup/utc boolean false
-d-i time/zone string Asia/Kolkata
-d-i clock-setup/ntp boolean false
-
-
-#Mirror/Repo
-d-i apt-setup/non-free boolean true
-d-i apt-setup/contrib boolean true
-
-# Uncomment this if you don't want to use a network mirror.
-d-i apt-setup/use_mirror boolean false
-
-#Bootloader
-
-
-# Avoid that last message about the install being complete
-#d-i finish-install/reboot_in_progress note
-
-# This command is run just before the install finishes, but when there is
-# still a usable /target directory. You can chroot to /target and use it
-# directly, or use the apt-install and in-target commands to easily install
-# packages and run commands in the target system.
-d-i preseed/late_command string echo "deb http://in.devel.hamaralinux.org/hamara-sugam namaste main contrib non-free" > /target/etc/apt/sources.list && echo "deb-src http://in.devel.hamaralinux.org/hamara-sugam namaste main contrib non-free" >> /target/etc/apt/sources.list && echo "deb http://security.debian.org/debian-security stretch/updates main" >> /target/etc/apt/sources.list
-d-i preseed/late_command string chroot /target apt-get purge -y xterm
diff --git a/config.d/hamara-sugam/config/includes.installer/usr/share/graphics/logo_hamara.png b/config.d/hamara-sugam/config/includes.installer/usr/share/graphics/logo_hamara.png
deleted file mode 100644
index b7eb9c4a7384d436445268043d86e1737b33d154..0000000000000000000000000000000000000000
Binary files a/config.d/hamara-sugam/config/includes.installer/usr/share/graphics/logo_hamara.png and /dev/null differ
diff --git a/config.d/hamara-sugam/config/includes.installer/usr/share/graphics/logo_installer.png b/config.d/hamara-sugam/config/includes.installer/usr/share/graphics/logo_installer.png
deleted file mode 120000
index a61cc359cba3abae086d59a67c836256b9416d0c..0000000000000000000000000000000000000000
--- a/config.d/hamara-sugam/config/includes.installer/usr/share/graphics/logo_installer.png
+++ /dev/null
@@ -1 +0,0 @@
-logo_hamara.png
\ No newline at end of file
diff --git a/config.d/hamara-sugam/config/source b/config.d/hamara-sugam/config/source
deleted file mode 100644
index 93a022a15f1923ef83afb4521193f061f9a60c7b..0000000000000000000000000000000000000000
--- a/config.d/hamara-sugam/config/source
+++ /dev/null
@@ -1,9 +0,0 @@
-# config/source - options for live-build(7), source stage
-
-# $LB_SOURCE: set source option
-# (Default: false)
-LB_SOURCE="false"
-
-# $LB_SOURCE_IMAGES: set image type
-# (Default: tar)
-LB_SOURCE_IMAGES="tar"
diff --git a/data/hamara-sugam/includes/usr/share/localechooser/languagelist b/data/hamara-sugam/includes/usr/share/localechooser/languagelist
deleted file mode 100644
index 434e286f5124ac8db8e42b21a6ee1d6337392b1b..0000000000000000000000000000000000000000
--- a/data/hamara-sugam/includes/usr/share/localechooser/languagelist
+++ /dev/null
@@ -1,13 +0,0 @@
-bn;4;BD;bn_BD;;
-bo;4;IN;bo_IN;;
-C;0;;C;en;
-en;0;IN;en_IN.UTF-8;;console-setup
-gu;4;IN;gu_IN;;
-hi;4;IN;hi_IN;;
-kn;4;IN;kn_IN;;
-ml;4;IN;ml_IN;;
-mr;4;IN;mr_IN;;
-ne;4;NP;ne_NP;;
-pa;4;IN;pa_IN;;
-ta;4;IN;ta_IN;;
-te;4;IN;te_IN;;
diff --git a/data/hamara-sugam/includes/usr/share/localechooser/languagelist.data.gz b/data/hamara-sugam/includes/usr/share/localechooser/languagelist.data.gz
deleted file mode 100644
index 6fc8c2fe44a7317f8d75af499a2334cd279d5a3e..0000000000000000000000000000000000000000
Binary files a/data/hamara-sugam/includes/usr/share/localechooser/languagelist.data.gz and /dev/null differ
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
deleted file mode 100755
index cebab61a7a04e57a288032a3e788a4bbee24b47b..0000000000000000000000000000000000000000
--- a/data/hamara-sugam/lb_scripts/installer_debian-installer
+++ /dev/null
@@ -1,829 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2015 Daniel Baumann <mail@daniel-baumann.ch>
-##
-## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-set -e
-
-# Including common functions
-[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'install debian-installer into binary')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${_DEBUG}" = "true" ]
-then
-	WGET_OPTIONS="${WGET_OPTIONS} --verbose"
-elif [ "${_QUIET}" = "true" ]
-then
-	WGET_OPTIONS="${WGET_OPTIONS} --quiet"
-else
-	WGET_OPTIONS="${WGET_OPTIONS} --no-verbose"
-fi
-
-# Check d-i configuration
-case "${LB_DEBIAN_INSTALLER}" in
-	true|cdrom|netinst|netboot|businesscard|live)
-		;;
-
-	false)
-		exit 0
-		;;
-
-	*)
-		Echo_error "debian-installer flavour %s not supported." "${LB_DEBIAN_INSTALLER}"
-		exit 1
-		;;
-esac
-
-Echo_message "Begin installing debian-installer..."
-
-# Requiring stage file
-Require_stagefile .build/config .build/bootstrap
-
-# Checking stage file
-Check_stagefile .build/installer_debian-installer
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Checking depends
-Check_package host /usr/bin/wget wget
-Check_package chroot /usr/bin/apt-ftparchive apt-utils
-
-# Restoring cache
-Restore_cache cache/packages.binary
-
-# Installing depends
-Install_package
-
-# Setting destination directory
-case "${LIVE_IMAGE_TYPE}" in
-	netboot)
-		DESTDIR="tftpboot/debian-install/${LB_ARCHITECTURES}"
-		;;
-
-	hdd*|tar)
-		DESTDIR="binary/install"
-		;;
-
-	*)
-		DESTDIR="binary/install"
-		;;
-esac
-
-# Set d-i image type
-case "${LB_DEBIAN_INSTALLER}" in
-	businesscard|netboot|netinst)
-		DI_IMAGE_TYPE="netboot"
-		;;
-	*)
-		case "${LIVE_IMAGE_TYPE}" in
-			netboot)
-				DI_IMAGE_TYPE="netboot"
-				;;
-
-			*)
-				DI_IMAGE_TYPE="cdrom"
-				;;
-		esac
-		;;
-esac
-
-# Set architecture-specific variables
-case "${LB_ARCHITECTURES}" in
-	armel)
-		DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')"
-		case "${DI_IMAGE_TYPE}" in
-			cdrom)
-				DI_REMOTE_BASE="${DEFAULT_FLAVOUR}/cdrom"
-				;;
-
-			netboot)
-				DI_REMOTE_BASE="${DEFAULT_FLAVOUR}/netboot"
-				;;
-		esac
-
-		DI_REMOTE_KERNEL="vmlinuz"
-		DI_REMOTE_BASE_GTK="${DI_REMOTE_BASE}/gtk"
-		;;
-
-	powerpc)
-		case "${DI_IMAGE_TYPE}" in
-			cdrom)
-				DI_REMOTE_BASE="${LB_ARCHITECTURES}/cdrom"
-			;;
-
-			netboot)
-				DI_REMOTE_BASE="${LB_ARCHITECTURES}/netboot"
-				;;
-		esac
-
-		DI_REMOTE_KERNEL="vmlinux"
-		DI_REMOTE_BASE_GTK="${DI_REMOTE_BASE}/gtk"
-		;;
-
-	*)
-		case "${DI_IMAGE_TYPE}" in
-			netboot)
-				DI_REMOTE_BASE="netboot/debian-installer/${LB_ARCHITECTURES}"
-				DI_REMOTE_BASE_GTK="netboot/gtk/debian-installer/${LB_ARCHITECTURES}"
-				DI_REMOTE_KERNEL="linux"
-				;;
-
-			cdrom)
-				DI_REMOTE_BASE="cdrom"
-				DI_REMOTE_BASE_GTK="cdrom/gtk"
-				DI_REMOTE_KERNEL="vmlinuz"
-				;;
-		esac
-		;;
-esac
-
-Check_multiarchitectures
-
-Install_file() {
-	local FILE
-	FILE="${1}"
-
-	local ARCHIVE_AREA
-	ARCHIVE_AREA="$(dpkg -I ${FILE} | awk '/^.*Section: / { print $2 }')"
-
-	if echo "${ARCHIVE_AREA}" | grep -qs '/'
-	then
-		ARCHIVE_AREA="$(echo ${ARCHIVE_AREA} | awk -F/ '{ print $1 }')"
-	else
-		ARCHIVE_AREA="main"
-	fi
-
-	local TARGET
-	TARGET="${2}/${ARCHIVE_AREA}"
-
-	SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')"
-
-	if [ -z "${SOURCE}" ]
-	then
-		SOURCE="$(basename ${FILE} | awk -F_ '{ print $1 }')"
-	fi
-
-	case "${SOURCE}" in
-		lib?*)
-			LETTER="$(echo ${SOURCE} | sed 's|\(....\).*|\1|')"
-			;;
-
-		*)
-			LETTER="$(echo ${SOURCE} | sed 's|\(.\).*|\1|')"
-			;;
-	esac
-
-	# Install directory
-	mkdir -p "${TARGET}"/"${LETTER}"/"${SOURCE}"
-
-	# Move files
-	cp "${FILE}" "${TARGET}"/"${LETTER}"/"${SOURCE}"
-}
-
-# Set absolute directory for caching; we require it when we call Download_file
-# from a non-standard cwd.
-_LB_CACHE_DIR="$(pwd)/cache/installer_debian-installer"
-
-Download_file () {
-	local _LB_TARGET
-	_LB_TARGET="${1}"
-
-	local _LB_URL
-	_LB_URL="${2}"
-
-	_LB_CACHE_FILE="${_LB_CACHE_DIR}/$(echo "$_LB_URL" | sed 's|/|_|g')"
-
-	if [ ! -f "${_LB_CACHE_FILE}" ]
-	then
-		mkdir -p ${_LB_CACHE_DIR}
-		if ! wget ${WGET_OPTIONS} -O "${_LB_CACHE_FILE}" "${_LB_URL}"
-		then
-			rm -f "${_LB_CACHE_FILE}"
-
-			Echo_error "Could not download file: %s" "${_LB_URL}"
-			exit 1
-		fi
-	fi
-
-	if [ "$(stat --printf %d "${_LB_CACHE_DIR}/")" = "$(stat --printf %d ./)" ]
-	then
-		CP_OPTIONS="-l"
-	fi
-
-	cp -f ${CP_OPTIONS} -- "${_LB_CACHE_FILE}" "${_LB_TARGET}"
-}
-
-VMLINUZ_DI="vmlinuz"
-INITRD_DI="initrd.gz"
-DESTDIR_DI="${DESTDIR}"
-
-VMLINUZ_GI="gtk/vmlinuz"
-INITRD_GI="gtk/initrd.gz"
-DESTDIR_GI="${DESTDIR}/gtk"
-
-case "${LB_DERIVATIVE}" in
-	false)
-		if [ "${LB_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ]
-		then
-			# FIXME: variable name should be decupled from derivatves
-			LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_DISTRIBUTION}"
-
-			# Debian Installer daily builds
-			URL="https://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/"
-		else
-			URL="http://in.devel.hamaralinux.org/debian-installer/installer-${LB_ARCHITECTURES}/current/images/"
-		fi
-		;;
-
-	true)
-		if [ "${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ]
-		then
-			LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_DISTRIBUTION}"
-
-			# Debian Installer daily builds
-			URL="https://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/"
-		else
-			URL="http://in.devel.hamaralinux.org/debian-installer/installer-${LB_ARCHITECTURES}/current/images/"
-		fi
-
-		if [ "${LB_MODE}" = "progress-linux" ]
-		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/"
-		fi
-		;;
-esac
-
-mkdir -p "${DESTDIR_DI}"
-
-# Downloading debian-installer
-Download_file "${DESTDIR}"/"${VMLINUZ_DI}" ${URL}/${DI_REMOTE_BASE}/${DI_REMOTE_KERNEL}
-Download_file "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI_REMOTE_BASE}/initrd.gz
-
-# Downloading graphical-installer
-DOWNLOAD_GTK_INSTALLER=0
-if [ "${LB_DEBIAN_INSTALLER_GUI}" = "true" ]
-then
-		case "${LB_ARCHITECTURES}" in
-		amd64|i386)
-			DOWNLOAD_GTK_INSTALLER=1
-			;;
-
-		powerpc)
-			if [ "${LB_DEBIAN_INSTALLER}" = "netboot" ]
-			then
-				DOWNLOAD_GTK_INSTALLER=1
-			fi
-			;;
-	esac
-fi
-
-if [ ${DOWNLOAD_GTK_INSTALLER} -eq 1 ]
-then
-	mkdir -p "${DESTDIR_GI}"
-	Download_file "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/${DI_REMOTE_KERNEL}
-	Download_file "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/initrd.gz
-fi
-
-# Only download additional packages if appropriate
-if [ "${DI_IMAGE_TYPE}" != "netboot" ]
-then
-	# Downloading additional packages
-	mkdir -p chroot/binary.deb/archives/partial
-
-	mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
-	touch chroot/var/lib/dpkg/status
-
-	case "${LB_ARCHITECTURES}" in
-		amd64)
-			DI_REQ_PACKAGES="lilo grub-pc"
-			DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-amd64"
-			;;
-
-		i386)
-			DI_REQ_PACKAGES="lilo grub-pc"
-			DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-686-pae"
-			;;
-
-		powerpc)
-			DI_REQ_PACKAGES="yaboot"
-			DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc linux-image-powerpc64 linux-image-powerpc-smp"
-			;;
-	esac
-
-	DI_PACKAGES="${DI_PACKAGES} busybox cryptsetup mdadm lvm2 xfsprogs jfsutils"
-
-	case "${LB_MODE}" in
-		debian)
-			DI_REQ_PACKAGES="${DI_REQ_PACKAGES} console-setup keyboard-configuration kbd"
-			DI_PACKAGES="${DI_PACKAGES} console-setup keyboard-configuration kbd"
-			;;
-	esac
-	# Include firmware packages
-	if [ "${LB_FIRMWARE_BINARY}" = "true" ]
-	then
-		# Assumption: firmware packages install files into /lib/firmware
-
-		# Get all firmware packages names
-		mkdir -p cache/contents.binary
-
-		FIRMWARE_PACKAGES=""
-
-		_CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LB_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/${_PARENT_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)"
-
-		rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES}
-
-		for _CONTENT in ${_CONTENTS}
-		do
-			wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES}
-
-			FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} | sort -u)"
-		done
-
-		if echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free"
-		then
-			# Manually add firmware-linux/non-free meta package
-			if [ "${LB_DERIVATIVE}" != "true" ]
-			then
-				FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
-			else
-				case "${LB_DERIVATIVE_IS_BASED_ON}" in
-					debian)
-						FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
-						;;
-					*)
-						;;
-				esac
-			fi
-		fi
-
-		if [ "${LB_DERIVATIVE}" = "true" ]
-		then
-			# FIXME: account for the fact that PARENT_DISTRIBUTION and DISTRIBUTION might be the same (to not have overlapping cache files for contents).
-
-			_CONTENTS="$(for _ARCHIVE_AREA in ${LB_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)"
-
-			rm -f cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES}
-
-			for _CONTENT in ${_CONTENTS}
-			do
-				wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES}
-
-				FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES} | sort -u)"
-			done
-		fi
-
-		# Drop section and keep package names only
-		for _PACKAGE in ${FIRMWARE_PACKAGES}
-		do
-			DI_FIRMWARE_PACKAGES="${DI_FIRMWARE_PACKAGES} $(echo ${_PACKAGE} | awk -F/ '{ print $NF }')"
-		done
-	fi
-
-	# Set apt command prefix
-	_LB_APT_COMMAND="apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb -o APT::Install-Recommends=false --download-only"
-
-	if [ "${LB_DEBIAN_INSTALLER}" = "live" ]
-	then
-		# We don't want to duplicate .debs of packages in binary/pool that are already
-		# installed to target/ via live-installer.
-		#
-		# However, we need to force various packages' inclusion in binary/pool as
-		# d-i does not support (for example) re-installing grub from target/ - the grub
-		# .debs must actually exist.
-
-		# Download .debs of the required packages
-		Chroot chroot ${_LB_APT_COMMAND} install ${DI_PACKAGES} ${DI_FIRMWARE_PACKAGES} ${DI_REQ_PACKAGES}
-
-		# Drop the packages already installed that d-i doesn't explicitely need
-		_REMAINING_PACKAGES="$(echo ${DI_FIRMWARE_PACKAGES} ${DI_REQ_PACKAGES} | sed -e 's# #|#g')"
-		_REMAINING_PACKAGES="$(sed -n -e 's|Package: ||p' chroot/var/lib/dpkg/status.tmp | grep -E -v "^(${_REMAINING_PACKAGES})\$")"
-
-		for _PACKAGE in ${_REMAINING_PACKAGES}
-		do
-			rm -f chroot/binary.deb/archives/${_PACKAGE}_*.deb
-		done
-	else
-		# Download .debs of the required packages
-		Chroot chroot ${_LB_APT_COMMAND} install ${DI_PACKAGES} ${DI_FIRMWARE_PACKAGES}
-	fi
-
-	# Revert dpkg status file
-	mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
-
-	mv chroot/binary.deb ./
-
-	for _ARCHIVE_AREA in $(echo ${LB_PARENT_ARCHIVE_AREAS} ${LB_ARCHIVE_AREAS})
-	do
-		mkdir -p binary/pool/${_ARCHIVE_AREA}
-	done
-
-	if Find_files binary.deb/archives/*.deb
-	then
-		for FILE in binary.deb/archives/*.deb
-		do
-			Install_file "${FILE}" "binary/pool"
-		done
-	fi
-
-	if [ "${LB_DEBIAN_INSTALLER}" != "live" ]
-	then
-		# Including base debian packages
-		if ls cache/packages.bootstrap/*.deb > /dev/null 2>&1
-		then
-			for FILE in cache/packages.bootstrap/*.deb
-			do
-				Install_file "${FILE}" "binary/pool"
-			done
-		else
-			Echo_error "Could not find packages in cache/packages.bootstrap."
-			Echo_error "You selected values of LB_CACHE, LB_CACHE_PACKAGES, LB_CACHE_STAGES and LB_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being cached - these are required when integrating the Debian Installer."
-			exit 1
-		fi
-	fi
-
-	# Including local debs
-	if Find_files config/packages.binary/*_"${LB_ARCHITECTURES}".deb || Find_files config/packages/*_"${LB_ARCHITECTURES}".deb
-	then
-		for FILE in config/packages.binary/*_"${LB_ARCHITECTURES}".deb config/packages/*_"${LB_ARCHITECTURES}".deb
-		do
-			if [ -e "${FILE}" ]
-			then
-				Install_file "${FILE}" "binary/pool"
-			fi
-		done
-	fi
-
-	if Find_files config/packages.binary/*_all.deb || Find_files config/packages/*_all.deb
-	then
-		for FILE in config/packages.binary/*_all.deb config/packages/*_all.deb
-		do
-			if [ -e "${FILE}" ]
-			then
-				Install_file "${FILE}" "binary/pool"
-			fi
-		done
-	fi
-
-	# Generating deb indices
-	for _ARCHIVE_AREA in $(cd binary/pool && ls)
-	do
-		mkdir -p binary/dists/namaste/${_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
-		Chroot chroot "sh binary.sh"
-		rm -f chroot/binary.sh
-		mv chroot/root/binary ./
-
-		gzip -9 -c binary/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}/Packages > binary/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}/Packages.gz
-
-		# Fetching release
-		Download_file binary/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}/Release "${LB_PARENT_MIRROR_CHROOT}"/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-"${LB_ARCHITECTURES}"/Release
-	done
-
-	# Symlink firmware packages to /firmware
-	if [ -n "${DI_FIRMWARE_PACKAGES}" ]
-	then
-		mkdir -p binary/firmware
-		cd binary/firmware
-
-		for _PACKAGE in ${DI_FIRMWARE_PACKAGES}
-		do
-			for _FILE in $(find ../pool -name "${_PACKAGE}_*.deb")
-			do
-				ln -sf ${_FILE} ./
-			done
-		done
-
-		cd "${OLDPWD}"
-	fi
-
-	# Udeb handling
-	mkdir binary.udeb
-	cd binary.udeb
-
-	# Downloading udeb indices
-	Download_file Packages.gz "${LB_MIRROR_CHROOT}"/dists/${LB_DISTRIBUTION}/main/debian-installer/binary-"${LB_ARCHITECTURES}"/Packages.gz
-	gunzip -c Packages.gz > Packages
-#commenting below so that  udebs will be downloaded from sid instead of hamara
-#	if [ "${LB_DERIVATIVE}" = "true" ]
-#	then
-		Download_file Packages.derivative.gz "${LB_MIRROR_CHROOT}"/dists/${LB_DISTRIBUTION}/main/debian-installer/binary-"${LB_ARCHITECTURES}"/Packages.gz
-		gunzip -c Packages.derivative.gz > Packages.derivative
-#	fi
-
-	# Sorting udebs
-	if [ "${LB_DERIVATIVE}" = true ]
-	then
-		UDEBS="$(awk '/Filename: / { print $2 }' Packages.derivative)"
-	fi
-
-	UDEBS="${UDEBS} $(awk '/Filename: / { print $2 }' Packages)"
-
-	# Downloading udebs packages
-	Echo_message "Downloading udebs..."
-
-	if [ "${LB_DERIVATIVE}" = "true" ]
-	then
-		Echo_message "Building in derivative mode in debian+ layout.. a lot of 404 errors are ok here."
-	fi
-
-	for UDEB in ${UDEBS}
-	do
-		if [ -f ../cache/packages.installer_debian-installer.udeb/"$(basename ${UDEB})" ]
-		then
-			# Copying cached udebs
-			cp ../cache/packages.installer_debian-installer.udeb/"$(basename ${UDEB})" ./
-		else
-			# Downloading udebs
-			if ! ls "$(basename ${UDEB} | awk -F_ '{ print $1 }')"_* > /dev/null 2>&1
-			then
-				wget ${WGET_OPTIONS} "${LB_MIRROR_CHROOT}"/${UDEB} || wget ${WGET_OPTIONS} "${LB_PARENT_MIRROR_CHROOT}"/${UDEB}
-			fi
-		fi
-	done
-
-	# Caching udebs
-	rm -rf ../cache/packages.installer_debian-installer.udeb
-	mkdir -p ../cache/packages.installer_debian-installer.udeb
-	cp *.udeb ../cache/packages.installer_debian-installer.udeb
-
-	# Including local udebs
-	if Find_files ../config/packages.binary/*_"${LB_ARCHITECTURES}".udeb || Find_files ../config/packages/*_"${LB_ARCHITECTURES}".udeb
-	then
-		for FILE in ../config/packages.binary/*_"${LB_ARCHITECTURES}".udeb ../config/packages/*_"${LB_ARCHITECTURES}".udeb
-		do
-			if [ -e "${FILE}" ]
-			then
-				Install_file "${FILE}" "pool"
-
-				# Prefer local udebs over downloaded udebs
-				rm -f "$(basename ${FILE} | awk -F_ '{ print $1 }')"_*.udeb
-			fi
-		done
-	fi
-
-	if Find_files ../config/packages.binary/*_all.udeb || Find_files ../config/packages/*_all.udeb
-	then
-		for FILE in ../config/packages.binary/*_all.udeb ../config/packages/*_all.udeb
-		do
-			if [ -e "${FILE}" ]
-			then
-				Install_file "${FILE}" "pool"
-
-				# Prefer local udebs over downloaded udebs
-				rm -f "$(basename ${FILE} | awk -F_ '{ print $1 }')"_*.udeb
-			fi
-		done
-	fi
-
-	# Excluding udebs
-	for LOCATION in "${LIVE_BUILD}/data/debian-cd" /usr/share/live/build/data/debian-cd
-	do
-		if [ -e "${LOCATION}" ]
-		then
-			grep -v "^#" "${LOCATION}/namaste/udeb_exclude" > exclude || true
-	grep -v "^#" "${LOCATION}/namaste/exclude-udebs" >> exclude || true
-	grep -v "^#" "${LOCATION}/namaste/exclude-udebs-${LB_ARCHITECTURES}" >> exclude || true
-
-			continue
-		fi
-	done
-
-	# Local exclude file
-	if [ -e ../config/debian-installer/udeb_exclude ]
-	then
-		cat ../config/debian-installer/udeb_exclude >> exclude
-	fi
-
-	# Excluding udebs from excludes because we want them to be in the image on purpose
-	sed -i -e 's|di-utils-exit-installer||' exclude # used for live-installer-launcher
-
-	while read EXCLUDE
-	do
-		if [ "${LB_DEBIAN_INSTALLER}" = "live" ] && [ "${EXCLUDE}" = "live-installer" ]
-		then
-			continue
-		fi
-
-		rm -f ${EXCLUDE}_*.udeb
-	done < exclude
-
-	# Moving udebs
-	for UDEB in ${UDEBS}
-	do
-		if [ -f "$(basename ${UDEB})" ]
-		then
-			mkdir -p $(dirname ${UDEB})
-			mv "$(basename ${UDEB})" "$(dirname ${UDEB})"
-		fi
-	done
-
-	# Creating udeb indices
-	mkdir -p dists/${LB_DISTRIBUTION}/main/debian-installer/binary-"${LB_ARCHITECTURES}"
-	cd "${OLDPWD}"
-
-	mv binary.udeb chroot/root
-	echo "cd /root/binary.udeb && apt-ftparchive packages pool/main > dists/${LB_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURES}/Packages" > chroot/binary.sh
-	Chroot chroot "sh binary.sh"
-	rm -f chroot/binary.sh
-	mv chroot/root/binary.udeb ./
-
-	cd binary.udeb
-	gzip -9 -c dists/${LB_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURES}/Packages > dists/${LB_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURES}/Packages.gz
-
-	rm -f Packages* exclude
-	find . | cpio -dmpu "${OLDPWD}"/binary
-	cd "${OLDPWD}"
-
-	rm -rf binary.udeb
-	rm -rf binary.deb
-
-	# Generating release file
-	mv binary chroot/root
-
-	if [ -e chroot/etc/os-release ]
-	then
-		_VERSION="$(. chroot/etc/os-release && echo ${VERSION_ID})"
-	fi
-
-	if [ -n "${_VERSION}" ]; then
-		_LB_APT_VERSION_OPT='-o APT::FTPArchive::Release::Version="'"${_VERSION}"'"'
-	fi
-
-	case "${LB_PARENT_DISTRIBUTION}" in
-		sid)
-			_SUITE="unstable"
-			;;
-
-		*)
-			_SUITE="${LB_PARENT_DISTRIBUTION}"
-			;;
-	esac
-
-cat > chroot/binary.sh << EOF
-cd /root/binary && apt-ftparchive \
-	-o APT::FTPArchive::Release::Origin="Hamara Sugam" \
-	-o APT::FTPArchive::Release::Label="Hamara Sugam" \
-	-o APT::FTPArchive::Release::Suite="${_SUITE}" \
-	${_LB_APT_VERSION_OPT} \
-	-o APT::FTPArchive::Release::Codename="${LB_PARENT_DISTRIBUTION}" \
-	-o APT::FTPArchive::Release::Date="$(date -R)" \
-	-o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURES}" \
-	-o APT::FTPArchive::Release::Components="${LB_PARENT_ARCHIVE_AREAS}" \
-	-o APT::FTPArchive::Release::Description="Last updated: $(date -R)" \
-	release dists/${LB_DISTRIBUTION} > dists/${LB_DISTRIBUTION}/Release
-EOF
-
-	Chroot chroot "sh binary.sh"
-	rm -f chroot/binary.sh
-	mv chroot/root/binary ./
-
-	case "${LB_PARENT_DISTRIBUTION}" in
-		jessie)
-			DISTRIBUTIONS="stable"
-			;;
-
-		*)
-			DISTRIBUTIONS="namaste"
-			;;
-	esac
-
-	if [ "${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" != "${LB_PARENT_DISTRIBUTION}" ]
-	then
-		DISTRIBUTIONS="${DISTRIBUTIONS} ${LB_PARENT_DISTRIBUTION}"
-	fi
-
-	case "${LIVE_IMAGE_TYPE}" in
-		hdd)
-			case "${LB_BINARY_FILESYSTEM}" in
-				fat*|ntfs)
-					# Creating dist directories
-					for DISTRIBUTION in ${DISTRIBUTIONS}
-					do
-						cp -a binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION} binary/dists/${DISTRIBUTION}
-					done
-					;;
-			esac
-			;;
-
-		*)
-			# Creating dist symlinks
-			for DISTRIBUTION in ${DISTRIBUTIONS}
-			do
-				ln -s ${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION} binary/dists/${DISTRIBUTION}
-			done
-
-			ln -s . binary/debian
-			;;
-	esac
-fi
-
-Repack_initrd()
-{
-	local TARGET_INITRD
-	local INCLUDE_PATH
-	TARGET_INITRD="${1}"
-	INCLUDE_PATH="${2}"
-	REPACK_TMPDIR="unpacked-initrd"
-
-	if [ -d "${INCLUDE_PATH}" ]
-	then
-		INCLUDE_PATH=$(readlink -f ${INCLUDE_PATH})
-	fi
-
-	# cpio does not have a "extract to directory", so we must change directory
-	mkdir -p ${REPACK_TMPDIR}
-	cd ${REPACK_TMPDIR}
-
-	gzip -d < ../${TARGET_INITRD} | cpio -i --make-directories --no-absolute-filenames
-	if [ ! -d "${INCLUDE_PATH}" ]
-	then
-		# Invoked the old way, just copy the preseeds
-		for _FILE in ../config/preseed/*.cfg ../config/preseed/*.cfg.installer
-		do
-			if [ -e "${_FILE}" ]
-			then
-				cp "${_FILE}" .
-			fi
-		done
-	else
-		# New way, include target directory content in the initrd
-		REPACK_TMPDIR_ABS="${PWD}"
-		cd "${INCLUDE_PATH}"
-		find -print0 | cpio -pumd0 --no-preserve-owner "${REPACK_TMPDIR_ABS}/"
-		cd "${OLDPWD}"
-	fi
-	find -print0 | cpio -H newc -o0 | gzip -9 > ../${TARGET_INITRD}
-
-	cd ..
-	rm -rf ${REPACK_TMPDIR}
-}
-
-# Preseed d-i by repacking the initrd in certain situations
-if [ "${DI_IMAGE_TYPE}" = "netboot" ] && ( ls config/preseed/*.cfg > /dev/null 2>&1 || ls config/preseed/*.cfg.installer > /dev/null 2>&1 )
-then
-	Repack_initrd "${DESTDIR}"/"${INITRD_DI}"
-
-	if [ -e "${DESTDIR}"/"${INITRD_GI}" ]
-	then
-		Repack_initrd "${DESTDIR}"/"${INITRD_GI}"
-	fi
-fi
-
-# Include content of config/includes.installer if exists and not empty
-if [ -d config/includes.installer ] && [ -n "$(ls -A config/includes.installer)" ]
-then
-	Repack_initrd "${DESTDIR}"/"${INITRD_DI}" config/includes.installer
-
-	if [ -e "${DESTDIR}"/"${INITRD_GI}" ]
-	then
-		Repack_initrd "${DESTDIR}"/"${INITRD_GI}" config/includes.installer
-	fi
-fi
-
-case "${LB_MODE}" in
-	progress-linux)
-		mv binary/install binary/installer
-
-		rm -f binary/debian
-
-		for _DIRECTORY in dists pool project firmware
-		do
-			if [ -e "binary/${_DIRECTORY}" ]
-			then
-				mv binary/"${_DIRECTORY}" binary/installer
-			fi
-		done
-		;;
-esac
-
-# Saving cache
-Save_cache cache/packages.binary
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .build/installer_debian-installer
diff --git a/data/hamara/includes/usr/share/localechooser/languagelist b/data/hamara/includes/usr/share/localechooser/languagelist
deleted file mode 100644
index 434e286f5124ac8db8e42b21a6ee1d6337392b1b..0000000000000000000000000000000000000000
--- a/data/hamara/includes/usr/share/localechooser/languagelist
+++ /dev/null
@@ -1,13 +0,0 @@
-bn;4;BD;bn_BD;;
-bo;4;IN;bo_IN;;
-C;0;;C;en;
-en;0;IN;en_IN.UTF-8;;console-setup
-gu;4;IN;gu_IN;;
-hi;4;IN;hi_IN;;
-kn;4;IN;kn_IN;;
-ml;4;IN;ml_IN;;
-mr;4;IN;mr_IN;;
-ne;4;NP;ne_NP;;
-pa;4;IN;pa_IN;;
-ta;4;IN;ta_IN;;
-te;4;IN;te_IN;;
diff --git a/data/hamara/includes/usr/share/localechooser/languagelist.data.gz b/data/hamara/includes/usr/share/localechooser/languagelist.data.gz
deleted file mode 100644
index 6fc8c2fe44a7317f8d75af499a2334cd279d5a3e..0000000000000000000000000000000000000000
Binary files a/data/hamara/includes/usr/share/localechooser/languagelist.data.gz and /dev/null differ
diff --git a/data/hamara/lb_scripts/bootstrap_archives b/data/hamara/lb_scripts/bootstrap_archives
index 73c9ff08abdb7d87bcd9fd82ddafc25ac6b50f30..61b46fc089474bfa5990bc0ee551f0aba9487425 100755
--- a/data/hamara/lb_scripts/bootstrap_archives
+++ b/data/hamara/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/lb_scripts/chroot_archives b/data/hamara/lb_scripts/chroot_archives
index bd29c94780b086b27ec523efff473876ccc00b53..0837272dbda10842dae38d99f6f52cc97e5660a8 100755
--- a/data/hamara/lb_scripts/chroot_archives
+++ b/data/hamara/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
diff --git a/hamara-sugam.conf b/hamara-sugam.conf
index 25dba6279aad422c01facd3dadd05d6a4383a068..fc58aa82effb0c1524e317a1269507dc2c2b2646 100755
--- a/hamara-sugam.conf
+++ b/hamara-sugam.conf
@@ -7,9 +7,9 @@ lb config --apt apt \
 		--binary-images iso-hybrid \
 		--bootloaders syslinux,grub-efi \
 		--compression gzip \
-		--debian-installer false \
 		--debian-installer-distribution namaste \
 		--debian-installer-gui false \
+		--debian-installer false \
 		--debootstrap-options "--keyring=/usr/share/keyrings/hamara-archive-keyring.gpg" \
 		--distribution namaste \
 		--firmware-binary true \
@@ -17,9 +17,9 @@ lb config --apt apt \
 		--hdd-label Hamara_Sugam_Live \
 		--initramfs live-boot \
 		--initsystem systemd \
-		--iso-application Hamara Sugam \
+		--iso-application "Hamara Sugam" \
 		--iso-preparer live-build 1:20170119 \
-		--iso-volume Hamara Sugam Live \
+		--iso-volume "Hamara Sugam Live" \
 		--keyring-packages hamara-keyring \
 		--linux-packages linux-image \
 		--memtest memtest86 \
diff --git a/mkbuild b/mkbuild
index 1290721f512d60a7a7d61f169898e1973ffc6545..2f654c2406685e1e8d2c1b8db8a4f504efa56a77 100755
--- a/mkbuild
+++ b/mkbuild
@@ -74,12 +74,10 @@ BUILD(){
 
 	Info "Copying config files"
 	. $DIR/$RELEASE.conf
-	cp -rv $DIR/config.d/$RELEASE/* $DIR/build_area/$RELEASE-$ARCH/
+	cp -rv $DIR/config.d/$RELEASE/config/* $DIR/build_area/$RELEASE-$ARCH/config/
 
 
 	if [ $ARCH == i386 ] ;then
-		Info "Copy installer files for i386 arch and set kernel flavour"
-		cp -r $DIR/data/includes/* $DIR/build_area/$RELEASE-$ARCH/config/includes.installer/
 		lb config -k 686
 	fi