diff --git a/pkg.info b/pkg.info
index 1a8374b..2852c20 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,11 +1,35 @@
 name: grub
 description: The GRand Unified Bootloader
-version: 2.12
-revision: 7
+version: "2.12"
+revision: 8
 url: https://www.gnu.org/software/grub/
 license: GPL3-or-later
 architecture: any
-keep: ["etc/default/grub"]
-optional_depends: ["os-prober"]
-make_depends: ["efibootmgr","freetype2","gzip","ttf-dejavu"]
 type: source
+keep:
+  - etc/default/grub
+depends:
+  - gettext
+  - lvm2
+  - xz-utils
+optional_depends:
+  - dosfs-tools
+  - efibootmgr
+  - freetype2
+  - fuse3
+  - mtools
+  - os-prober
+make_depends:
+  - freetype2
+  - fuse3
+  - gzip
+  - lvm2
+  - ttf-dejavu
+downloads:
+  - url: https://ftpmirror.gnu.org/gnu/grub/grub-${BPM_PKG_VERSION}.tar.xz
+    extract_to: ${BPM_SOURCE}
+    extract_strip_components: 1
+    checksum: f3c97391f7c4eaa677a78e090c7e97e6dc47b16f655f04683ebd37bef7fe0faa
+  - url: https://ftpmirror.gnu.org/gnu/unifont/unifont-16.0.03/unifont-16.0.03.bdf.gz
+    filepath: unifont.bdf.gz
+    checksum: 7f3d1664ac1c051f59a1a1360dd654f78d82c246a688c342e863cec7f6ba95d4
diff --git a/source.sh b/source.sh
index c475040..18c946c 100644
--- a/source.sh
+++ b/source.sh
@@ -2,22 +2,11 @@
 # BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE
 # BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT
 
-DOWNLOAD="https://ftpmirror.gnu.org/gnu/grub/grub-${BPM_PKG_VERSION}.tar.xz"
-UNIFONT_VERSION="16.0.03"
-DOWNLOAD_UNIFONT="https://ftpmirror.gnu.org/gnu/unifont/unifont-${UNIFONT_VERSION}/unifont-${UNIFONT_VERSION}.bdf.gz"
-FILENAME="${DOWNLOAD##*/}"
-FILENAME_UNIFONT="${DOWNLOAD_UNIFONT##*/}"
-
 # The prepare function is executed in the root of the temp directory
-# This function is used for downloading files and putting them into the correct location
+# This function is used for putting downloaded files to the correct location or applying patches
 prepare() {
-  wget "$DOWNLOAD"
-  wget "$DOWNLOAD_UNIFONT"
-  
-  tar -xvf "$FILENAME" --strip-components=1 -C "$BPM_SOURCE"
-
   # Decompress unifont file to source directory
-  gunzip -c "$FILENAME_UNIFONT" > "$BPM_SOURCE"/unifont.bdf
+  gunzip -c unifont.bdf.gz > "$BPM_SOURCE"/unifont.bdf
 }
 
 # The build function is executed in the source directory