diff --git a/resources/InstallResources/firefox-esr/prawn-settings.js b/resources/InstallResources/firefox-esr/prawn-settings.js
new file mode 100644
index 0000000..f85785a
--- /dev/null
+++ b/resources/InstallResources/firefox-esr/prawn-settings.js
@@ -0,0 +1,3 @@
+pref("general.config.filename", "prawn.cfg");
+pref("general.config.obscure_value", 0);
+
diff --git a/resources/InstallResources/firefox-esr/prawn.cfg b/resources/InstallResources/firefox-esr/prawn.cfg
new file mode 100644
index 0000000..bf4167d
--- /dev/null
+++ b/resources/InstallResources/firefox-esr/prawn.cfg
@@ -0,0 +1,68 @@
+//
+
+defaultPref("general.useragent.override", "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:52.0) Gecko/20100101 Firefox/52.0");
+defaultPref("browser.startup.homepage", "about:blank");
+defaultPref("general.smoothScroll", false);
+defaultPref("browser.tabs.animate", false);
+defaultPref("browser.fullscreen.animate", false);
+defaultPref("browser.download.animateNotifications", false);
+defaultPref("toolkit.cosmeticAnimations.enabled", false);
+defaultPref("nglayout.progressive-paint", true);
+defaultPref("nglayout.initialpaint.delay", 0);
+
+defaultPref("browser.reader.detectedFirstArticle", true);
+defaultPref("browser.startup.homepage_override.mstone", "ignore");
+defaultPref("browser.startup.homepage", "about:blank");
+defaultPref("browser.startup.firstrunSkipsHomepage", false);
+defaultPref("browser.newtabpage.enabled", false);
+defaultPref("datareporting.policy.dataSubmissionPolicyAcceptedVersion", 2);
+defaultPref("privacy.trackingprotection.introCount", 20);
+defaultPref("browser.newtabpage.introShown", true);
+defaultPref("browser.slowStartup.notificationDisabled", true);
+defaultPref("dom.max_script_run_time", 30);
+
+defaultPref("reader.parse-on-load.force-enabled", false);
+defaultPref("app.shield.optoutstudies.enabled", false);
+defaultPref("experiments.supported", false);
+defaultPref("experiments.enabled", false);
+defaultPref("experiments.activeExperiment", false);
+defaultPref("network.allow-experiments", false);
+defaultPref("pdfjs.disabled", true);
+
+defaultPref("browser.cache.disk.enable", false);
+defaultPref("browser.cache.memory.enable", true);
+defaultPref("browser.sessionstore.interval", 1200000);
+
+defaultPref("privacy.resistFingerprinting", true);
+defaultPref("privacy.trackingprotection.enabled", false);
+defaultPref("privacy.trackingprotection.pbmode.enabled", false);
+defaultPref("browser.safebrowsing.malware.enabled", false);
+defaultPref("browser.safebrowsing.phishing.enabled", false);
+defaultPref("browser.safebrowsing.downloads.enabled", false);
+defaultPref("browser.safebrowsing.blockedURIs.enabled", false);
+defaultPref("privacy.donottrackheader.enabled", true);
+defaultPref("media.peerconnection.enabled", false);
+defaultPref("toolkit.telemetry.enabled", false);
+defaultPref("toolkit.telemetry.unified", false);
+defaultPref("browser.tabs.crashReporting.sendReport", false);
+defaultPref("webgl.disabled", true);
+defaultPref("datareporting.healthreport.uploadEnabled", false);
+defaultPref("datareporting.policy.dataSubmissionEnabled", false);
+defaultPref("browser.send_pings", false);
+defaultPref("beacon.enabled", false);
+defaultPref("media.eme.enabled", false);
+defaultPref("browser.search.suggest.enabled", false);
+defaultPref("extensions.pocket.enabled", false);
+defaultPref("media.getusermedia.screensharing.enabled", false);
+defaultPref("browser.selfsupport.url", "");
+defaultPref("browser.casting.enabled", false);
+defaultPref("network.captive-portal-service.enabled", false);
+defaultPref("network.http.speculative-parallel-limit", 0);
+defaultPref("media.gmp-gmpopenh264.enabled", false);
+defaultPref("app.shield.optoutstudies.enabled", false);
+defaultPref("browser.newtabpage.directory.ping", "");
+defaultPref("browser.newtabpage.directory.source", "");
+defaultPref("geo.enabled", false);
+defaultPref("geo.wifi.uri", "");
+defaultPref("browser.search.geoip.url", "");
+
diff --git a/resources/InstallResources/fonts/source-code-pro b/resources/InstallResources/fonts/source-code-pro
new file mode 160000
index 0000000..e99ed3b
--- /dev/null
+++ b/resources/InstallResources/fonts/source-code-pro
@@ -0,0 +1 @@
+Subproject commit e99ed3b714cd2b3c0d5ac8cc45fd8181d79c0d0b
diff --git a/resources/InstallResources/xfce-config/plank/plank-launchers/emacs25.dockitem b/resources/InstallResources/xfce-config/plank/plank-launchers/emacs25.dockitem
new file mode 100644
index 0000000..217b019
--- /dev/null
+++ b/resources/InstallResources/xfce-config/plank/plank-launchers/emacs25.dockitem
@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/emacs25.desktop
diff --git a/resources/InstallResources/xfce-config/plank/plank-launchers/firefox-esr.dockitem b/resources/InstallResources/xfce-config/plank/plank-launchers/firefox-esr.dockitem
new file mode 100644
index 0000000..851a492
--- /dev/null
+++ b/resources/InstallResources/xfce-config/plank/plank-launchers/firefox-esr.dockitem
@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/firefox-esr.desktop
diff --git a/scripts/InstallScripts/InstallPackages.sh b/scripts/InstallScripts/InstallPackages.sh
index 0b37c2b..37edb5d 100755
--- a/scripts/InstallScripts/InstallPackages.sh
+++ b/scripts/InstallScripts/InstallPackages.sh
@@ -32,7 +32,7 @@ locale-gen
 apt install -y xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils mousepad vlc dconf-tools sudo dtrx emacs25
 apt install -y network-manager-gnome network-manager-openvpn network-manager-openvpn-gnome
 
-[ "$DE" = "xfce" ] && apt install -y xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies numix-gtk-theme plank
+[ "$DE" = "xfce" ] && apt install -y xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies numix-gtk-theme plank accountsservice firefox-esr
 [ "$DE" = "lxqt" ] && apt install -y lxqt
 
 if [ "$DE" = "xfce" ]
@@ -68,6 +68,15 @@ then
   mkdir -p /etc/skel/.config/plank/dock1/launchers/
   cp -rf $DIR/xfce-config/plank/plank-launchers/* /etc/skel/.config/plank/dock1/launchers/
 
+  #install firefox-esr default settings
+  cp $DIR/firefox-esr/prawn-settings.js /usr/lib/firefox-esr/defaults/pref/
+  cp $DIR/firefox-esr/prawn.cfg /usr/lib/firefox-esr/
+
+  #Install the source code pro font for spacemacs
+  [ -d /usr/share/fonts/opentype ] || mkdir /usr/share/fonts/opentype
+  cp -rf $DIR/fonts/* /usr/share/fonts/opentype/
+  fc-cache
+
   #Install xmodmap map, autostart
   cp -rf $DIR/xfce-config/xmodmap/.Xmodmap /etc/skel/
   cp -rf $DIR/xfce-config/xmodmap/.xinitrc /etc/skel/
diff --git a/scripts/buildDebianFs.sh b/scripts/buildDebianFs.sh
index 799947c..d1fa711 100755
--- a/scripts/buildDebianFs.sh
+++ b/scripts/buildDebianFs.sh
@@ -109,7 +109,7 @@ chroot $outmnt apt-get autoremove --purge
 chroot $outmnt apt-get clean
 
 #Download the packages to be installed by Install.sh:
-chroot $outmnt apt-get install -y -d xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils lxqt crda xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies mousepad vlc libutempter0 xterm numix-gtk-theme dconf-tools plank network-manager-gnome network-manager-openvpn network-manager-openvpn-gnome dtrx emacs25
+chroot $outmnt apt-get install -y -d xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils lxqt crda xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies mousepad vlc libutempter0 xterm numix-gtk-theme dconf-tools plank network-manager-gnome network-manager-openvpn network-manager-openvpn-gnome dtrx emacs25 accountsservice firefox-esr
 
 #Download support for libinput-gestures
 chroot $outmnt apt install -y libinput-tools xdotool build-essential