diff --git a/.gitignore b/.gitignore
index 2ec3a32..8f75be2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /result
 /matrix/result
+grub2-installer-theme.tar.gz
+dejavu.pf2
diff --git a/Makefile b/Makefile
index 9b6556e..da2a26e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-modules = icons
+modules = icons bootloader
 
 .PHONY: $(modules) install clean all
 
diff --git a/bootloader/Makefile b/bootloader/Makefile
new file mode 100644
index 0000000..935f6fe
--- /dev/null
+++ b/bootloader/Makefile
@@ -0,0 +1,17 @@
+grub2_icons := $(wildcard grub2-installer/icons/*.svg)
+grub2_icons_png := $(foreach icon,$(icons),$(subst .svg,.png,$(icon)))
+
+grub2-installer-theme.tar.gz: $(icons_png) $(wildcard grub2-installer/*.png) grub2-installer/dejavu.pf2 grub2-installer/theme.txt
+	tar -czf $@ $^
+
+.PHONY: clean
+
+clean:
+	rm $(icons_png) grub2-installer/dejavu.pf2 grub2-installer-theme.tar.gz
+
+grub2-installer/icons/%.png: grub2-installer/icons/%.svg
+	inkscape -o $@ $<
+
+grub2-installer/dejavu.pf2:
+	grub-mkfont -s 20 "$(dejavu)/share/fonts/truetype/DejaVuSans.ttf" -o $@
+
diff --git a/bootloader/grub2-installer/dejavu.pf2 b/bootloader/grub2-installer/dejavu.pf2
deleted file mode 100644
index 8ab1c44..0000000
Binary files a/bootloader/grub2-installer/dejavu.pf2 and /dev/null differ
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 0000000..3edc710
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,6 @@
+with import <nixpkgs> {};
+mkShell {
+  nativeBuildInputs = [ grub2_efi inkscape imagemagick ];
+  dejavu = dejavu_fonts;
+  __strictDeps = true;
+}