diff --git a/drivers/fat.cpp b/drivers/fat.cpp
index ec3cc47..f9258b4 100644
--- a/drivers/fat.cpp
+++ b/drivers/fat.cpp
@@ -99,7 +99,7 @@ static EsError Load(KNode *_directory, KNode *_node, KNodeMetadata *, const void
 				superBlock->sectorsPerCluster * SECTOR_SIZE, K_ACCESS_READ, (uint8_t *) clusterBuffer, ES_FLAGS_DEFAULT);
 		if (error != ES_SUCCESS) return error;
 
-		entry = *(FATDirectoryEntry *) (clusterBuffer + reference.offset);
+		entry = ((FATDirectoryEntry *) clusterBuffer)[reference.offset];
 	} else {
 		entry = directory->rootDirectory[reference.offset];
 	}
diff --git a/res/System Configuration Template.ini b/res/System Configuration Template.ini
index 1cb8268..b619aee 100644
--- a/res/System Configuration Template.ini	
+++ b/res/System Configuration Template.ini	
@@ -1,7 +1,7 @@
 [general]
 fonts_path=0:/Essence/Fonts
 temporary_path=0:/Essence/Temporary
-default_settings_path=0:/Settings
+default_settings_path=0:/Essence/Settings
 default_user_documents_path=0:/
 click_chain_timeout_ms=500
 show_cursor_shadow=1
diff --git a/util/build.c b/util/build.c
index e092cb0..bbcc32c 100644
--- a/util/build.c
+++ b/util/build.c
@@ -402,11 +402,20 @@ void Run(int emulator, int log, int debug) {
 			// -serial file:out.txt
 			// -enable-kvm (doesn't work with GDB)
 
-			const char *driveFlags = IsOptionEnabled("Emulator.ATA")  ? "-drive file=bin/drive,format=raw,media=disk,index=0 " : 
-						 IsOptionEnabled("Emulator.AHCI") ? "-drive file=bin/drive,if=none,id=mydisk,format=raw,media=disk,index=0 "
+			const char *biosFlags = "";
+			const char *drivePrefix = "-drive file=bin/drive";
+
+			if (IsOptionEnabled("Emulator.QemuEFI")) {
+				CallSystem("util/uefi.sh");
+				biosFlags = " -bios /usr/share/ovmf/x64/OVMF.fd ";
+				drivePrefix = "-drive file=bin/uefi_drive";
+			}
+
+			const char *driveFlags = IsOptionEnabled("Emulator.ATA")  ? ",format=raw,media=disk,index=0 " : 
+						 IsOptionEnabled("Emulator.AHCI") ? ",if=none,id=mydisk,format=raw,media=disk,index=0 "
 						    		                    "-device ich9-ahci,id=ahci "
 							       	                    "-device ide-hd,drive=mydisk,bus=ahci.0 "
-						                                  : "-drive file=bin/drive,if=none,id=mydisk,format=raw "
+						                                  : ",if=none,id=mydisk,format=raw "
                                                                                     "-device nvme,drive=mydisk,serial=1234 ";
 
 			const char *cdromImage = GetOptionString("Emulator.CDROMImage");
@@ -459,14 +468,14 @@ void Run(int emulator, int log, int debug) {
 			const char *logFlags = log == LOG_VERBOSE ? "-d cpu_reset,int > bin/qemu_log.txt 2>&1" 
 				: (log == LOG_NORMAL ? " > bin/qemu_log.txt 2>&1" : " > /dev/null 2>&1");
 
-			CallSystemF("%s %s qemu-system-x86_64 %s %s -m %d -s %s -smp cores=%d -cpu Haswell "
+			CallSystemF("%s %s qemu-system-x86_64 %s%s %s -m %d -s %s -smp cores=%d -cpu Haswell "
 					" -device qemu-xhci,id=xhci -device usb-kbd,bus=xhci.0,id=mykeyboard -device usb-mouse,bus=xhci.0,id=mymouse "
 					" -netdev user,id=u1 -device e1000,netdev=u1 -object filter-dump,id=f1,netdev=u1,file=bin/net.dat "
-					" %s %s %s %s %s ", 
-					audioFlags, IsOptionEnabled("Emulator.RunWithSudo") ? "sudo " : "", driveFlags, cdromFlags, 
+					" %s %s %s %s %s %s ", 
+					audioFlags, IsOptionEnabled("Emulator.RunWithSudo") ? "sudo " : "", drivePrefix, driveFlags, cdromFlags, 
 					atoi(GetOptionString("Emulator.MemoryMB")), 
 					debug ? (debug == DEBUG_NONE ? "-enable-kvm" : "-S") : "", 
-					atoi(GetOptionString("Emulator.Cores")), audioFlags2, logFlags, usbFlags, usbFlags2, secondaryDriveFlags);
+					atoi(GetOptionString("Emulator.Cores")), audioFlags2, logFlags, usbFlags, usbFlags2, secondaryDriveFlags, biosFlags);
 		} break;
 
 		case EMULATOR_BOCHS: {
@@ -479,7 +488,7 @@ void Run(int emulator, int log, int debug) {
 			CallSystem("VBoxManage storageattach Essence --storagectl AHCI --port 0 --device 0 --type hdd --medium none");
 			CallSystem("VBoxManage closemedium disk bin/vbox.vdi --delete");
 
-			if (IsOptionEnabled("Emulator.GenerateVDIForUEFI")) {
+			if (IsOptionEnabled("Emulator.VBoxEFI")) {
 				CallSystem("util/uefi.sh");
 				CallSystem("VBoxManage convertfromraw bin/uefi_drive bin/vbox.vdi --format VDI");
 				CallSystem("VBoxManage modifyvm Essence --firmware efi");
diff --git a/util/build_common.h b/util/build_common.h
index 9ce6937..30fb6e8 100644
--- a/util/build_common.h
+++ b/util/build_common.h
@@ -304,7 +304,8 @@ Option options[] = {
 	{ "Emulator.Cores", OPTION_TYPE_STRING, { .s = "1" } },
 	{ "Emulator.PrimaryDriveMB", OPTION_TYPE_STRING, { .s = "1024" } },
 	{ "Emulator.SecondaryDriveMB", OPTION_TYPE_STRING, { .s = NULL } },
-	{ "Emulator.GenerateVDIForUEFI", OPTION_TYPE_BOOL, { .b = false } },
+	{ "Emulator.VBoxEFI", OPTION_TYPE_BOOL, { .b = false } },
+	{ "Emulator.QemuEFI", OPTION_TYPE_BOOL, { .b = false } },
 	{ "General.first_application", OPTION_TYPE_STRING, { .s = NULL } },
 	{ "General.wallpaper", OPTION_TYPE_STRING, { .s = NULL } },
 	{ "General.installation_state", OPTION_TYPE_STRING, { .s = "0" } },
diff --git a/util/build_core.c b/util/build_core.c
index 9e300bc..8947e49 100644
--- a/util/build_core.c
+++ b/util/build_core.c
@@ -820,7 +820,7 @@ void OutputSystemConfiguration() {
 		FilePrintFormat(file, "\n[@application %d]\n", applications[i].id);
 		FilePrintFormat(file, "name=%s\n", applications[i].name);
 		FilePrintFormat(file, "executable=0:/Applications/%s.esx\n", applications[i].name);
-		FilePrintFormat(file, "settings_path=0:/Settings/%s\n", applications[i].name);
+		FilePrintFormat(file, "settings_path=0:/Essence/Settings/%s\n", applications[i].name);
 		FilePrintFormat(file, "is_file_manager=%d\n", 0 == strcmp(applications[i].name, "File Manager") ? 1 : 0);
 
 		for (uintptr_t j = 0; j < arrlenu(applications[i].properties); j++) {