diff --git a/build/LICENSE b/LICENSE
similarity index 98%
rename from build/LICENSE
rename to LICENSE
index eb0e2d7..f288702 100644
--- a/build/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -631,13 +631,8 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-<<<<<<< HEAD
     <one line to give the program's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
-=======
-    {one line to give the program's name and a brief idea of what it does.}
-    Copyright (C) {year}  {name of author}
->>>>>>> 1e9bc6968bd083cca14b3e8852067fdb56296a0b
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -650,18 +645,14 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-<<<<<<< HEAD
     <program>  Copyright (C) <year>  <name of author>
-=======
-    {project}  Copyright (C) {year}  {fullname}
->>>>>>> 1e9bc6968bd083cca14b3e8852067fdb56296a0b
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -673,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/build/build/F123Light.conf b/build/build/F123Light.conf
index 8b7f122..4d07b04 100644
--- a/build/build/F123Light.conf
+++ b/build/build/F123Light.conf
@@ -9,7 +9,7 @@ workdir=${PWD}/F123Light
 version=$(date +%y.%m.%d)
 
 #The full path and filename of the Raspberry Pi image file
-imagename="${PWD}/F123Light-${version}.img"
+imagename="${PWD}/F123Light-pi4-${version}.img"
 
 # The size of the image file in MB, for example 8192 will create an 8GB zero-filled image file
 imagesize=7168
@@ -52,4 +52,4 @@ networkname=
 wifipass=
 
 # A list of services to be enabled once the OS is installed
-services="atd cronie dbus-broker dhcpcd@eth0 growpartfs loginsound logoutsound NetworkManager nodm ntpd sshd fake-hwclock fake-hwclock-save.timer fstrim.timer bluetooth brcm43438 pulseaudio zramswap"
+services="atd cronie dbus-broker dhcpcd@eth0 loginsound logoutsound nodm ntpd sshd fake-hwclock fake-hwclock-save.timer bluetooth ModemManagerr pulseaudio zramswap"
diff --git a/build/build/package_lists/packages.list b/build/build/package_lists/packages.list
index 96db4cc..52b6886 100644
--- a/build/build/package_lists/packages.list
+++ b/build/build/package_lists/packages.list
@@ -1,4 +1,6 @@
 base
+linux-raspberrypi4
+linux-raspberrypi4-headers
 ne
 nodm
 notify-osd
@@ -30,19 +32,13 @@ cfh-client
 configure-wifi-git
 chromium
 cronie
-cryptsetup
 cuneiform
 dbus-broker
-dhcpcd
-device-mapper
-diffutils
 dragonfm-git
 discount
 dialog
 dos2unix
 dotconf
-e2fsprogs
-ethtool
 espeak-ng-extended-git
 epub2txt
 fake-hwclock
@@ -53,35 +49,27 @@ fribidi
 galculator
 git
 glipper
-growpart
 gst-plugins-bad
 gst-plugins-ugly
 gvfs
 horseshoes-git
 hunspell
 imagemagick
-inetutils
 intltool
 irssi
-jfsutils
 jshon
 json-c
 libao
 libksane
 liblouis
 libltdl
+libmm-glib
 libnewt
 libpulse
 libsonic-git
 liburcu
-linux-raspberrypi
 lios-git
-logrotate
-lvm2
 lxterminal
-man-db
-man-pages
-mate-panel
 mbrola-git
 mbrola-voices-af1
 mbrola-voices-ar1
@@ -121,20 +109,17 @@ mbrola-voices-us2
 mbrola-voices-us3
 mhwaveedit
 mlterm
+modemmanager
 mpv
 mutt
 mygtkmenu
-nano
-network-manager-applet
 parted
 pcaudiolib
 pcmanfm
 pdmenu-git
-perl
 perl-json-xs
 perl-text-charwidth
 perl-term-readline-gnu
-pi-bluetooth
 pianobar
 pidgin
 pidgin-otr
@@ -144,6 +129,8 @@ pulseaudio
 pulseaudio-alsa
 pulseaudio-bluetooth
 python
+python2
+python-aiml
 python-cairo
 python-daemonize
 python-dbus
@@ -159,8 +146,6 @@ python-pyudev
 python-setuptools
 python-xlsx2csv
 ratpoison
-rclone-browser
-reiserfsprogs
 rhvoice-git
 ripit
 rpi-clone-git
@@ -181,7 +166,6 @@ speech-dispatcher
 storebackup
 sudo
 surfraw
-sysfsutils
 t4kcommon-git
 telegram-cli-git
 telegram-purple
@@ -191,7 +175,6 @@ tesseract-data-fra
 tesseract-data-por
 tesseract-data-spa
 tesseract
-texinfo
 thunderbird
 tintin
 ttf-dejavu
@@ -200,18 +183,16 @@ tuxtype-git
 units
 update-f123light
 unzip
-usbutils
-vi
 w3m
 wget
-which
 wireless_tools
+wordgrinder-git
 wpa_supplicant
 xarchiver
 xclip
 xdg-user-dirs
+xf86-video-dummy-with-vt
 xf86-video-vesa
-xfsprogs
 xorg-bdftopcf
 xorg-docs
 xorg-font-util