6 files changed, 455 insertions, 535 deletions

diff --git a/dev/boot/src/HEL/AMD64/BootATA.cc b/dev/boot/src/HEL/AMD64/BootATA.cc
index 8b1b5a0a..693513e0 100644
--- a/dev/boot/src/HEL/AMD64/BootATA.cc
+++ b/dev/boot/src/HEL/AMD64/BootATA.cc
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
+  Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
 
 ------------------------------------------- */
 
@@ -15,9 +15,9 @@
  *
  */
 
-#include <FirmwareKit/EFI.h>
 #include <BootKit/BootKit.h>
 #include <BootKit/HW/ATA.h>
+#include <FirmwareKit/EFI.h>
 
 /// bugs: 0
 
@@ -25,159 +25,143 @@ using namespace Boot;
 
 #define kATADataLen (256)
 
-static Boolean kATADetected			 = false;
+static Boolean kATADetected          = false;
 static UInt16  kATAData[kATADataLen] = {0};
 
 Boolean boot_ata_detected(Void);
 
-STATIC Boolean boot_ata_wait_io(UInt16 IO)
-{
-	for (int i = 0; i < 400; i++)
-		rt_in8(IO + ATA_REG_STATUS);
+STATIC Boolean boot_ata_wait_io(UInt16 IO) {
+  for (int i = 0; i < 400; i++) rt_in8(IO + ATA_REG_STATUS);
 
 ATAWaitForIO_Retry:
-	auto status_rdy = rt_in8(IO + ATA_REG_STATUS);
+  auto status_rdy = rt_in8(IO + ATA_REG_STATUS);
 
-	if ((status_rdy & ATA_SR_BSY))
-		goto ATAWaitForIO_Retry;
+  if ((status_rdy & ATA_SR_BSY)) goto ATAWaitForIO_Retry;
 
 ATAWaitForIO_Retry2:
-	status_rdy = rt_in8(IO + ATA_REG_STATUS);
+  status_rdy = rt_in8(IO + ATA_REG_STATUS);
 
-	if (status_rdy & ATA_SR_ERR)
-		return false;
+  if (status_rdy & ATA_SR_ERR) return false;
 
-	if (!(status_rdy & ATA_SR_DRDY))
-		goto ATAWaitForIO_Retry2;
+  if (!(status_rdy & ATA_SR_DRDY)) goto ATAWaitForIO_Retry2;
 
-	return true;
+  return true;
 }
 
-Void boot_ata_select(UInt16 Bus)
-{
-	if (Bus == ATA_PRIMARY_IO)
-		rt_out8(Bus + ATA_REG_HDDEVSEL, ATA_PRIMARY_SEL);
-	else
-		rt_out8(Bus + ATA_REG_HDDEVSEL, ATA_SECONDARY_SEL);
+Void boot_ata_select(UInt16 Bus) {
+  if (Bus == ATA_PRIMARY_IO)
+    rt_out8(Bus + ATA_REG_HDDEVSEL, ATA_PRIMARY_SEL);
+  else
+    rt_out8(Bus + ATA_REG_HDDEVSEL, ATA_SECONDARY_SEL);
 }
 
-Boolean boot_ata_init(UInt16 Bus, UInt8 Drive, UInt16& OutBus, UInt8& OutMaster)
-{
-	NE_UNUSED(Drive);
+Boolean boot_ata_init(UInt16 Bus, UInt8 Drive, UInt16& OutBus, UInt8& OutMaster) {
+  NE_UNUSED(Drive);
 
-	if (boot_ata_detected())
-		return true;
+  if (boot_ata_detected()) return true;
 
-	BootTextWriter writer;
+  BootTextWriter writer;
 
-	UInt16 IO = Bus;
+  UInt16 IO = Bus;
 
-	boot_ata_select(IO);
+  boot_ata_select(IO);
 
-	// Bus init, NEIN bit.
-	rt_out8(IO + ATA_REG_NEIN, 1);
+  // Bus init, NEIN bit.
+  rt_out8(IO + ATA_REG_NEIN, 1);
 
-	// identify until it's good.
+  // identify until it's good.
 ATAInit_Retry:
-	auto status_rdy = rt_in8(IO + ATA_REG_STATUS);
+  auto status_rdy = rt_in8(IO + ATA_REG_STATUS);
 
-	if (status_rdy & ATA_SR_ERR)
-	{
-		writer.Write(
-			L"BootZ: ATA: Not an IDE based drive.\r");
+  if (status_rdy & ATA_SR_ERR) {
+    writer.Write(L"BootZ: ATA: Not an IDE based drive.\r");
 
-		return false;
-	}
+    return false;
+  }
 
-	if ((status_rdy & ATA_SR_BSY))
-		goto ATAInit_Retry;
+  if ((status_rdy & ATA_SR_BSY)) goto ATAInit_Retry;
 
-	rt_out8(IO + ATA_REG_COMMAND, ATA_CMD_IDENTIFY);
+  rt_out8(IO + ATA_REG_COMMAND, ATA_CMD_IDENTIFY);
 
-	/// fetch serial info
-	/// model, speed, number of sectors...
+  /// fetch serial info
+  /// model, speed, number of sectors...
 
-	boot_ata_wait_io(IO);
+  boot_ata_wait_io(IO);
 
-	for (SizeT indexData = 0ul; indexData < kATADataLen; ++indexData)
-	{
-		kATAData[indexData] = Kernel::HAL::rt_in16(IO + ATA_REG_DATA);
-	}
+  for (SizeT indexData = 0ul; indexData < kATADataLen; ++indexData) {
+    kATAData[indexData] = Kernel::HAL::rt_in16(IO + ATA_REG_DATA);
+  }
 
-	OutBus =
-		(Bus == ATA_PRIMARY_IO) ? BootDeviceATA::kPrimary : BootDeviceATA::kSecondary;
+  OutBus = (Bus == ATA_PRIMARY_IO) ? BootDeviceATA::kPrimary : BootDeviceATA::kSecondary;
 
-	OutMaster = (Bus == ATA_PRIMARY_IO) ? ATA_MASTER : ATA_SLAVE;
+  OutMaster = (Bus == ATA_PRIMARY_IO) ? ATA_MASTER : ATA_SLAVE;
 
-	return true;
+  return true;
 }
 
-Void boot_ata_read(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf, SizeT SectorSz, SizeT Size)
-{
-	Lba /= SectorSz;
+Void boot_ata_read(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf, SizeT SectorSz,
+                   SizeT Size) {
+  Lba /= SectorSz;
 
-	UInt8 Command = ((!Master) ? 0xE0 : 0xF0);
+  UInt8 Command = ((!Master) ? 0xE0 : 0xF0);
 
-	boot_ata_wait_io(IO);
-	boot_ata_select(IO);
+  boot_ata_wait_io(IO);
+  boot_ata_select(IO);
 
-	rt_out8(IO + ATA_REG_HDDEVSEL, (Command) | (((Lba) >> 24) & 0x0F));
+  rt_out8(IO + ATA_REG_HDDEVSEL, (Command) | (((Lba) >> 24) & 0x0F));
 
-	rt_out8(IO + ATA_REG_SEC_COUNT0, ((Size + SectorSz) / SectorSz));
+  rt_out8(IO + ATA_REG_SEC_COUNT0, ((Size + SectorSz) / SectorSz));
 
-	rt_out8(IO + ATA_REG_LBA0, (Lba)&0xFF);
-	rt_out8(IO + ATA_REG_LBA1, (Lba) >> 8);
-	rt_out8(IO + ATA_REG_LBA2, (Lba) >> 16);
-	rt_out8(IO + ATA_REG_LBA3, (Lba) >> 24);
+  rt_out8(IO + ATA_REG_LBA0, (Lba) & 0xFF);
+  rt_out8(IO + ATA_REG_LBA1, (Lba) >> 8);
+  rt_out8(IO + ATA_REG_LBA2, (Lba) >> 16);
+  rt_out8(IO + ATA_REG_LBA3, (Lba) >> 24);
 
-	rt_out8(IO + ATA_REG_COMMAND, ATA_CMD_READ_PIO);
+  rt_out8(IO + ATA_REG_COMMAND, ATA_CMD_READ_PIO);
 
-	boot_ata_wait_io(IO);
+  boot_ata_wait_io(IO);
 
-	for (SizeT IndexOff = 0; IndexOff < Size; ++IndexOff)
-	{
-		boot_ata_wait_io(IO);
-		Buf[IndexOff] = Kernel::HAL::rt_in16(IO + ATA_REG_DATA);
-		boot_ata_wait_io(IO);
-	}
+  for (SizeT IndexOff = 0; IndexOff < Size; ++IndexOff) {
+    boot_ata_wait_io(IO);
+    Buf[IndexOff] = Kernel::HAL::rt_in16(IO + ATA_REG_DATA);
+    boot_ata_wait_io(IO);
+  }
 }
 
-Void boot_ata_write(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf, SizeT SectorSz, SizeT Size)
-{
-	Lba /= SectorSz;
+Void boot_ata_write(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf, SizeT SectorSz,
+                    SizeT Size) {
+  Lba /= SectorSz;
 
-	UInt8 Command = ((!Master) ? 0xE0 : 0xF0);
+  UInt8 Command = ((!Master) ? 0xE0 : 0xF0);
 
-	boot_ata_wait_io(IO);
-	boot_ata_select(IO);
+  boot_ata_wait_io(IO);
+  boot_ata_select(IO);
 
-	rt_out8(IO + ATA_REG_HDDEVSEL, (Command) | (((Lba) >> 24) & 0x0F));
+  rt_out8(IO + ATA_REG_HDDEVSEL, (Command) | (((Lba) >> 24) & 0x0F));
 
-	rt_out8(IO + ATA_REG_SEC_COUNT0, ((Size + (SectorSz)) / SectorSz));
+  rt_out8(IO + ATA_REG_SEC_COUNT0, ((Size + (SectorSz)) / SectorSz));
 
-	rt_out8(IO + ATA_REG_LBA0, (Lba)&0xFF);
-	rt_out8(IO + ATA_REG_LBA1, (Lba) >> 8);
-	rt_out8(IO + ATA_REG_LBA2, (Lba) >> 16);
-	rt_out8(IO + ATA_REG_LBA3, (Lba) >> 24);
+  rt_out8(IO + ATA_REG_LBA0, (Lba) & 0xFF);
+  rt_out8(IO + ATA_REG_LBA1, (Lba) >> 8);
+  rt_out8(IO + ATA_REG_LBA2, (Lba) >> 16);
+  rt_out8(IO + ATA_REG_LBA3, (Lba) >> 24);
 
-	rt_out8(IO + ATA_REG_COMMAND, ATA_CMD_WRITE_PIO);
+  rt_out8(IO + ATA_REG_COMMAND, ATA_CMD_WRITE_PIO);
 
-	boot_ata_wait_io(IO);
+  boot_ata_wait_io(IO);
 
-	for (SizeT IndexOff = 0; IndexOff < Size; ++IndexOff)
-	{
-		boot_ata_wait_io(IO);
-		rt_out16(IO + ATA_REG_DATA, Buf[IndexOff]);
-		boot_ata_wait_io(IO);
-	}
+  for (SizeT IndexOff = 0; IndexOff < Size; ++IndexOff) {
+    boot_ata_wait_io(IO);
+    rt_out16(IO + ATA_REG_DATA, Buf[IndexOff]);
+    boot_ata_wait_io(IO);
+  }
 
-	boot_ata_wait_io(IO);
+  boot_ata_wait_io(IO);
 }
 
 /// @check is ATA detected?
-Boolean boot_ata_detected(Void)
-{
-	return kATADetected;
+Boolean boot_ata_detected(Void) {
+  return kATADetected;
 }
 
 /***
@@ -192,93 +176,79 @@ Boolean boot_ata_detected(Void)
  * @brief ATA Device constructor.
  * @param void none.
  */
-BootDeviceATA::BootDeviceATA() noexcept
-{
-	if (boot_ata_init(ATA_PRIMARY_IO, true, this->Leak().mBus,
-					  this->Leak().mMaster) ||
-		boot_ata_init(ATA_SECONDARY_IO, true, this->Leak().mBus,
-					  this->Leak().mMaster))
-	{
-		kATADetected = true;
-	}
+BootDeviceATA::BootDeviceATA() noexcept {
+  if (boot_ata_init(ATA_PRIMARY_IO, true, this->Leak().mBus, this->Leak().mMaster) ||
+      boot_ata_init(ATA_SECONDARY_IO, true, this->Leak().mBus, this->Leak().mMaster)) {
+    kATADetected = true;
+  }
 }
 /**
  * @brief Is ATA detected?
  */
-BootDeviceATA::operator bool()
-{
-	return boot_ata_detected();
+BootDeviceATA::operator bool() {
+  return boot_ata_detected();
 }
 
 /**
-	@brief Read Buf from disk
-	@param Sz Sector size
-	@param Buf buffer
+  @brief Read Buf from disk
+  @param Sz Sector size
+  @param Buf buffer
 */
-BootDeviceATA& BootDeviceATA::Read(CharacterTypeUTF8* Buf, SizeT SectorSz)
-{
-	if (!boot_ata_detected())
-	{
-		Leak().mErr = true;
-		return *this;
-	}
+BootDeviceATA& BootDeviceATA::Read(CharacterTypeUTF8* Buf, SizeT SectorSz) {
+  if (!boot_ata_detected()) {
+    Leak().mErr = true;
+    return *this;
+  }
 
-	this->Leak().mErr = false;
+  this->Leak().mErr = false;
 
-	if (!Buf || SectorSz < 1)
-		return *this;
+  if (!Buf || SectorSz < 1) return *this;
 
-	boot_ata_read(this->Leak().mBase, this->Leak().mBus, this->Leak().mMaster,
-				  Buf, SectorSz, this->Leak().mSize);
+  boot_ata_read(this->Leak().mBase, this->Leak().mBus, this->Leak().mMaster, Buf, SectorSz,
+                this->Leak().mSize);
 
-	return *this;
+  return *this;
 }
 
 /**
-	@brief Write Buf into disk
-	@param Sz Sector size
-	@param Buf buffer
+  @brief Write Buf into disk
+  @param Sz Sector size
+  @param Buf buffer
 */
-BootDeviceATA& BootDeviceATA::Write(CharacterTypeUTF8* Buf, SizeT SectorSz)
-{
-	if (!boot_ata_detected())
-	{
-		Leak().mErr = true;
-		return *this;
-	}
-
-	Leak().mErr = false;
-
-	if (!Buf || SectorSz < 1 || this->Leak().mSize < 1)
-	{
-		Leak().mErr = true;
-		return *this;
-	}
-
-	boot_ata_write(this->Leak().mBase, this->Leak().mBus, this->Leak().mMaster,
-				   Buf, SectorSz, this->Leak().mSize);
-
-	return *this;
+BootDeviceATA& BootDeviceATA::Write(CharacterTypeUTF8* Buf, SizeT SectorSz) {
+  if (!boot_ata_detected()) {
+    Leak().mErr = true;
+    return *this;
+  }
+
+  Leak().mErr = false;
+
+  if (!Buf || SectorSz < 1 || this->Leak().mSize < 1) {
+    Leak().mErr = true;
+    return *this;
+  }
+
+  boot_ata_write(this->Leak().mBase, this->Leak().mBus, this->Leak().mMaster, Buf, SectorSz,
+                 this->Leak().mSize);
+
+  return *this;
 }
 
 /**
  * @brief ATA trait getter.
  * @return BootDeviceATA::ATATrait& the drive config.
  */
-BootDeviceATA::ATATrait& BootDeviceATA::Leak()
-{
-	return mTrait;
+BootDeviceATA::ATATrait& BootDeviceATA::Leak() {
+  return mTrait;
 }
 
 /***
-	@brief Getter, gets the number of sectors inside the drive.
+  @brief Getter, gets the number of sectors inside the drive.
 */
-SizeT BootDeviceATA::GetSectorsCount() noexcept
-{
-	return (kATAData[61] << 16) | kATAData[60];
+SizeT BootDeviceATA::GetSectorsCount() noexcept {
+  return (kATAData[61] << 16) | kATAData[60];
 }
 
-SizeT BootDeviceATA::GetDiskSize() noexcept
-{
-	return this->GetSectorsCount() * BootDeviceATA::kSectorSize;
+SizeT BootDeviceATA::GetDiskSize() noexcept {
+  return this->GetSectorsCount() * BootDeviceATA::kSectorSize;
 }
diff --git a/dev/boot/src/HEL/AMD64/BootEFI.cc b/dev/boot/src/HEL/AMD64/BootEFI.cc
index 6411383d..739876da 100644
--- a/dev/boot/src/HEL/AMD64/BootEFI.cc
+++ b/dev/boot/src/HEL/AMD64/BootEFI.cc
@@ -1,12 +1,11 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
+  Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
 
 ------------------------------------------- */
 
 #include <BootKit/BootKit.h>
-#include <modules/CoreGfx/CoreGfx.h>
-#include <modules/CoreGfx/TextGfx.h>
+#include <BootKit/BootThread.h>
 #include <FirmwareKit/EFI.h>
 #include <FirmwareKit/EFI/API.h>
 #include <FirmwareKit/Handover.h>
@@ -15,265 +14,249 @@
 #include <KernelKit/PEF.h>
 #include <NewKit/Macros.h>
 #include <NewKit/Ref.h>
-#include <BootKit/BootThread.h>
 #include <modules/CoreGfx/CoreGfx.h>
+#include <modules/CoreGfx/TextGfx.h>
 
 // Makes the compiler shut up.
 #ifndef kMachineModel
 #define kMachineModel "OS"
-#endif // !kMachineModel
+#endif  // !kMachineModel
 
 /** Graphics related. */
 
-STATIC EfiGraphicsOutputProtocol* kGop		 = nullptr;
-STATIC UInt16					  kGopStride = 0U;
-STATIC EfiGUID					  kGopGuid;
+STATIC EfiGraphicsOutputProtocol* kGop       = nullptr;
+STATIC UInt16                     kGopStride = 0U;
+STATIC EfiGUID                    kGopGuid;
 
 /** Related to jumping to the reset vector. */
 
 EXTERN_C Void rt_reset_hardware();
 
 /**
-	@brief Finds and stores the GOP object.
+  @brief Finds and stores the GOP object.
 */
-STATIC Bool boot_init_fb() noexcept
-{
-	kGopGuid = EfiGUID(EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID);
-	kGop	 = nullptr;
+STATIC Bool boot_init_fb() noexcept {
+  kGopGuid = EfiGUID(EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID);
+  kGop     = nullptr;
 
-	if (BS->LocateProtocol(&kGopGuid, nullptr, (VoidPtr*)&kGop) != kEfiOk)
-		return No;
+  if (BS->LocateProtocol(&kGopGuid, nullptr, (VoidPtr*) &kGop) != kEfiOk) return No;
 
-	kGopStride = 4;
+  kGopStride = 4;
 
-	return Yes;
+  return Yes;
 }
 
 EfiGUID kEfiGlobalNamespaceVarGUID = {
-	0x8BE4DF61, 0x93CA, 0x11D2, {0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C}};
+    0x8BE4DF61, 0x93CA, 0x11D2, {0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C}};
 
 /// @brief BootloaderMain EFI entrypoint.
 /// @param image_handle Handle of this image.
 /// @param sys_table The system table of it.
 /// @return nothing, never returns.
-EFI_EXTERN_C EFI_API Int32 BootloaderMain(EfiHandlePtr	  image_handle,
-										  EfiSystemTable* sys_table)
-{
-	fw_init_efi(sys_table); ///! Init the EFI library.
+EFI_EXTERN_C EFI_API Int32 BootloaderMain(EfiHandlePtr image_handle, EfiSystemTable* sys_table) {
+  fw_init_efi(sys_table);  ///! Init the EFI library.
+
+  ST->ConOut->ClearScreen(sys_table->ConOut);
+  ST->ConOut->SetAttribute(sys_table->ConOut, kEFIYellow);
+
+  ST->BootServices->SetWatchdogTimer(0, 0, 0, nullptr);
+  ST->ConOut->EnableCursor(ST->ConOut, false);
 
-	ST->ConOut->ClearScreen(sys_table->ConOut);
-	ST->ConOut->SetAttribute(sys_table->ConOut, kEFIYellow);
+  HEL::BootInfoHeader* handover_hdr = new HEL::BootInfoHeader();
 
-	ST->BootServices->SetWatchdogTimer(0, 0, 0, nullptr);
-	ST->ConOut->EnableCursor(ST->ConOut, false);
+  UInt32               map_key         = 0;
+  UInt32               size_struct_ptr = sizeof(EfiMemoryDescriptor);
+  EfiMemoryDescriptor* struct_ptr      = nullptr;
+  UInt32               sz_desc         = sizeof(EfiMemoryDescriptor);
+  UInt32               rev_desc        = 0;
 
-	HEL::BootInfoHeader* handover_hdr =
-		new HEL::BootInfoHeader();
+  Boot::BootTextWriter writer;
 
-	UInt32				 map_key		 = 0;
-	UInt32				 size_struct_ptr = sizeof(EfiMemoryDescriptor);
-	EfiMemoryDescriptor* struct_ptr		 = nullptr;
-	UInt32				 sz_desc		 = sizeof(EfiMemoryDescriptor);
-	UInt32				 rev_desc		 = 0;
-
-	Boot::BootTextWriter writer;
+  if (!boot_init_fb()) {
+    writer.Write("BootZ: Invalid Framebuffer, can't boot to NeKernel.\r");
+    Boot::Stop();
+  }
 
-	if (!boot_init_fb())
-	{
-		writer.Write("BootZ: Invalid Framebuffer, can't boot to NeKernel.\r");
-		Boot::Stop();
-	}
-
-	for (SizeT index_vt = 0; index_vt < sys_table->NumberOfTableEntries;
-		 ++index_vt)
-	{
-		Char* vendor_table = reinterpret_cast<Char*>(
-			sys_table->ConfigurationTable[index_vt].VendorTable);
+  for (SizeT index_vt = 0; index_vt < sys_table->NumberOfTableEntries; ++index_vt) {
+    Char* vendor_table =
+        reinterpret_cast<Char*>(sys_table->ConfigurationTable[index_vt].VendorTable);
 
-		// ACPI's 'RSD PTR', which contains the ACPI SDT (MADT, FACP...)
-		if (vendor_table[0] == 'R' && vendor_table[1] == 'S' &&
-			vendor_table[2] == 'D' && vendor_table[3] == ' ' &&
-			vendor_table[4] == 'P' && vendor_table[5] == 'T' &&
-			vendor_table[6] == 'R' && vendor_table[7] == ' ')
-		{
-			handover_hdr->f_HardwareTables.f_VendorPtr = (VoidPtr)vendor_table;
-			break;
-		}
-	}
+    // ACPI's 'RSD PTR', which contains the ACPI SDT (MADT, FACP...)
+    if (vendor_table[0] == 'R' && vendor_table[1] == 'S' && vendor_table[2] == 'D' &&
+        vendor_table[3] == ' ' && vendor_table[4] == 'P' && vendor_table[5] == 'T' &&
+        vendor_table[6] == 'R' && vendor_table[7] == ' ') {
+      handover_hdr->f_HardwareTables.f_VendorPtr = (VoidPtr) vendor_table;
+      break;
+    }
+  }
 
-	// ------------------------------------------ //
-	// draw background color.
-	// ------------------------------------------ //
+  // ------------------------------------------ //
+  // draw background color.
+  // ------------------------------------------ //
 
-	handover_hdr->f_GOP.f_The		   = kGop->Mode->FrameBufferBase;
-	handover_hdr->f_GOP.f_Width		   = kGop->Mode->Info->VerticalResolution;
-	handover_hdr->f_GOP.f_Height	   = kGop->Mode->Info->HorizontalResolution;
-	handover_hdr->f_GOP.f_PixelPerLine = kGop->Mode->Info->PixelsPerScanLine;
-	handover_hdr->f_GOP.f_PixelFormat  = kGop->Mode->Info->PixelFormat;
-	handover_hdr->f_GOP.f_Size		   = kGop->Mode->FrameBufferSize;
+  handover_hdr->f_GOP.f_The          = kGop->Mode->FrameBufferBase;
+  handover_hdr->f_GOP.f_Width        = kGop->Mode->Info->VerticalResolution;
+  handover_hdr->f_GOP.f_Height       = kGop->Mode->Info->HorizontalResolution;
+  handover_hdr->f_GOP.f_PixelPerLine = kGop->Mode->Info->PixelsPerScanLine;
+  handover_hdr->f_GOP.f_PixelFormat  = kGop->Mode->Info->PixelFormat;
+  handover_hdr->f_GOP.f_Size         = kGop->Mode->FrameBufferSize;
 
-	// ------------------------------------------- //
-	// Grab MP services, extended to runtime.	   //
-	// ------------------------------------------- //
+  // ------------------------------------------- //
+  // Grab MP services, extended to runtime.	   //
+  // ------------------------------------------- //
 
-	EfiGUID				   guid_mp = EfiGUID(EFI_MP_SERVICES_PROTOCOL_GUID);
-	EfiMpServicesProtocol* mp	   = nullptr;
+  EfiGUID                guid_mp = EfiGUID(EFI_MP_SERVICES_PROTOCOL_GUID);
+  EfiMpServicesProtocol* mp      = nullptr;
 
-	BS->LocateProtocol(&guid_mp, nullptr, reinterpret_cast<VoidPtr*>(&mp));
+  BS->LocateProtocol(&guid_mp, nullptr, reinterpret_cast<VoidPtr*>(&mp));
 
-	handover_hdr->f_HardwareTables.f_MpPtr = reinterpret_cast<VoidPtr>(mp);
+  handover_hdr->f_HardwareTables.f_MpPtr = reinterpret_cast<VoidPtr>(mp);
 
-	kHandoverHeader = handover_hdr;
+  kHandoverHeader = handover_hdr;
 
-	FB::fb_clear_video();
+  FB::fb_clear_video();
 
-	UInt32 cnt_enabled	= 0;
-	UInt32 cnt_disabled = 0;
+  UInt32 cnt_enabled  = 0;
+  UInt32 cnt_disabled = 0;
 
-	if (mp)
-	{
-		mp->GetNumberOfProcessors(mp, &cnt_disabled, &cnt_enabled);
-		handover_hdr->f_HardwareTables.f_MultiProcessingEnabled = cnt_enabled > 1;
-	}
-	else
-	{
-		handover_hdr->f_HardwareTables.f_MultiProcessingEnabled = NO;
-	}
+  if (mp) {
+    mp->GetNumberOfProcessors(mp, &cnt_disabled, &cnt_enabled);
+    handover_hdr->f_HardwareTables.f_MultiProcessingEnabled = cnt_enabled > 1;
+  } else {
+    handover_hdr->f_HardwareTables.f_MultiProcessingEnabled = NO;
+  }
 
-	// Fill handover header now.
+  // Fill handover header now.
 
-	handover_hdr->f_BitMapStart = nullptr;			 /* Start of bitmap. */
-	handover_hdr->f_BitMapSize	= kHandoverBitMapSz; /* Size of bitmap in bytes. */
+  handover_hdr->f_BitMapStart = nullptr;           /* Start of bitmap. */
+  handover_hdr->f_BitMapSize  = kHandoverBitMapSz; /* Size of bitmap in bytes. */
 
-	Int32 trials = 5 * 10000000;
+  Int32 trials = 5 * 10000000;
 
-	writer.Write("BootZ: Welcome to BootZ.\r");
-	writer.Write("BootZ: Allocating sufficent memory, trying 4GB...\r");
+  writer.Write("BootZ: Welcome to BootZ.\r");
+  writer.Write("BootZ: Allocating sufficent memory, trying 4GB...\r");
 
-	while (BS->AllocatePool(EfiLoaderData, handover_hdr->f_BitMapSize, &handover_hdr->f_BitMapStart) != kEfiOk)
-	{
-		--trials;
+  while (BS->AllocatePool(EfiLoaderData, handover_hdr->f_BitMapSize,
+                          &handover_hdr->f_BitMapStart) != kEfiOk) {
+    --trials;
 
-		if (!trials)
-		{
-			writer.Write("BootZ: Unable to allocate sufficent memory, trying again with 2GB...\r");
+    if (!trials) {
+      writer.Write("BootZ: Unable to allocate sufficent memory, trying again with 2GB...\r");
 
-			trials = 3 * 10000000;
+      trials = 3 * 10000000;
 
-			handover_hdr->f_BitMapSize = kHandoverBitMapSz / 2; /* Size of bitmap in bytes. */
+      handover_hdr->f_BitMapSize = kHandoverBitMapSz / 2; /* Size of bitmap in bytes. */
 
-			while (BS->AllocatePool(EfiLoaderData, handover_hdr->f_BitMapSize, &handover_hdr->f_BitMapStart) != kEfiOk)
-			{
-				--trials;
+      while (BS->AllocatePool(EfiLoaderData, handover_hdr->f_BitMapSize,
+                              &handover_hdr->f_BitMapStart) != kEfiOk) {
+        --trials;
 
-				if (!trials)
-				{
-					writer.Write("BootZ: Unable to allocate sufficent memory, aborting...\r");
-					Boot::Stop();
-				}
-			}
-		}
-	}
+        if (!trials) {
+          writer.Write("BootZ: Unable to allocate sufficent memory, aborting...\r");
+          Boot::Stop();
+        }
+      }
+    }
+  }
 
-	handover_hdr->f_FirmwareCustomTables[0] = (VoidPtr)BS;
-	handover_hdr->f_FirmwareCustomTables[1] = (VoidPtr)ST;
+  handover_hdr->f_FirmwareCustomTables[0] = (VoidPtr) BS;
+  handover_hdr->f_FirmwareCustomTables[1] = (VoidPtr) ST;
 
-	// ------------------------------------------ //
-	// If we succeed in reading the blob, then execute it.
-	// ------------------------------------------ //
+  // ------------------------------------------ //
+  // If we succeed in reading the blob, then execute it.
+  // ------------------------------------------ //
 
-	Boot::BootFileReader reader_syschk(L"chk.efi", image_handle);
-	reader_syschk.ReadAll(0);
+  Boot::BootFileReader reader_syschk(L"chk.efi", image_handle);
+  reader_syschk.ReadAll(0);
 
-	Boot::BootThread* syschk_thread = nullptr;
+  Boot::BootThread* syschk_thread = nullptr;
 
-	if (reader_syschk.Blob())
-	{
-		syschk_thread = new Boot::BootThread(reader_syschk.Blob());
-		syschk_thread->SetName("BootZ/SysChk");
+  if (reader_syschk.Blob()) {
+    syschk_thread = new Boot::BootThread(reader_syschk.Blob());
+    syschk_thread->SetName("BootZ/SysChk");
 
-		syschk_thread->Start(handover_hdr, NO);
-	}
+    syschk_thread->Start(handover_hdr, NO);
+  }
 
-	BS->GetMemoryMap(&size_struct_ptr, struct_ptr, &map_key, &sz_desc, &rev_desc);
+  BS->GetMemoryMap(&size_struct_ptr, struct_ptr, &map_key, &sz_desc, &rev_desc);
 
-	handover_hdr->f_FirmwareVendorLen = Boot::BStrLen(sys_table->FirmwareVendor);
+  handover_hdr->f_FirmwareVendorLen = Boot::BStrLen(sys_table->FirmwareVendor);
 
-	handover_hdr->f_Magic	= kHandoverMagic;
-	handover_hdr->f_Version = kHandoverVersion;
+  handover_hdr->f_Magic   = kHandoverMagic;
+  handover_hdr->f_Version = kHandoverVersion;
 
-	handover_hdr->f_HardwareTables.f_ImageKey	 = map_key;
-	handover_hdr->f_HardwareTables.f_ImageHandle = image_handle;
+  handover_hdr->f_HardwareTables.f_ImageKey    = map_key;
+  handover_hdr->f_HardwareTables.f_ImageHandle = image_handle;
 
-	// Provide fimware vendor name.
+  // Provide fimware vendor name.
 
-	Boot::BCopyMem(handover_hdr->f_FirmwareVendorName, sys_table->FirmwareVendor,
-				   handover_hdr->f_FirmwareVendorLen);
+  Boot::BCopyMem(handover_hdr->f_FirmwareVendorName, sys_table->FirmwareVendor,
+                 handover_hdr->f_FirmwareVendorLen);
 
-	handover_hdr->f_FirmwareVendorLen = Boot::BStrLen(sys_table->FirmwareVendor);
-	// Assign to global 'kHandoverHeader'.
+  handover_hdr->f_FirmwareVendorLen = Boot::BStrLen(sys_table->FirmwareVendor);
+  // Assign to global 'kHandoverHeader'.
 
-	WideChar kernel_path[256U] = L"krnl.efi";
-	UInt32	 kernel_path_sz	   = 256U;
+  WideChar kernel_path[256U] = L"krnl.efi";
+  UInt32   kernel_path_sz    = 256U;
 
-	if (ST->RuntimeServices->GetVariable(L"/props/boot_path", kEfiGlobalNamespaceVarGUID, nullptr, &kernel_path_sz, kernel_path) != kEfiOk)
-	{
-		/// access attributes (in order)
-		/// EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS
-		UInt32 attr = 0x00000001 | 0x00000002 | 0x00000004;
+  if (ST->RuntimeServices->GetVariable(L"/props/boot_path", kEfiGlobalNamespaceVarGUID, nullptr,
+                                       &kernel_path_sz, kernel_path) != kEfiOk) {
+    /// access attributes (in order)
+    /// EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS
+    UInt32 attr = 0x00000001 | 0x00000002 | 0x00000004;
 
-		ST->RuntimeServices->SetVariable(L"/props/boot_path", kEfiGlobalNamespaceVarGUID, &attr, &kernel_path_sz, kernel_path);
-	}
+    ST->RuntimeServices->SetVariable(L"/props/boot_path", kEfiGlobalNamespaceVarGUID, &attr,
+                                     &kernel_path_sz, kernel_path);
+  }
 
-	UInt32 sz_ver = sizeof(UInt64);
-	UInt64 ver	  = KERNEL_VERSION_BCD;
+  UInt32 sz_ver = sizeof(UInt64);
+  UInt64 ver    = KERNEL_VERSION_BCD;
 
-	ST->RuntimeServices->GetVariable(L"/props/kern_ver", kEfiGlobalNamespaceVarGUID, nullptr, &sz_ver, &ver);
+  ST->RuntimeServices->GetVariable(L"/props/kern_ver", kEfiGlobalNamespaceVarGUID, nullptr, &sz_ver,
+                                   &ver);
 
-	if (ver != KERNEL_VERSION_BCD)
-	{
-		ver = KERNEL_VERSION_BCD;
+  if (ver != KERNEL_VERSION_BCD) {
+    ver = KERNEL_VERSION_BCD;
 
-		ST->RuntimeServices->SetVariable(L"/props/kern_ver", kEfiGlobalNamespaceVarGUID, nullptr, &sz_ver, &ver);
-		writer.Write("BootZ: version has been updated: ").Write(ver).Write("\r");
-	}
+    ST->RuntimeServices->SetVariable(L"/props/kern_ver", kEfiGlobalNamespaceVarGUID, nullptr,
+                                     &sz_ver, &ver);
+    writer.Write("BootZ: version has been updated: ").Write(ver).Write("\r");
+  }
 
-	writer.Write("BootZ: version: ").Write(ver).Write("\r");
+  writer.Write("BootZ: version: ").Write(ver).Write("\r");
 
-	// boot to kernel, if not netboot this.
+  // boot to kernel, if not netboot this.
 
-	Boot::BootFileReader reader_kernel(kernel_path, image_handle);
+  Boot::BootFileReader reader_kernel(kernel_path, image_handle);
 
-	reader_kernel.ReadAll(0);
+  reader_kernel.ReadAll(0);
 
-	// ------------------------------------------ //
-	// If we succeed in reading the blob, then execute it.
-	// ------------------------------------------ //
+  // ------------------------------------------ //
+  // If we succeed in reading the blob, then execute it.
+  // ------------------------------------------ //
 
-	if (reader_kernel.Blob())
-	{
-		// ------------------------------------------ //
-		// null these fields, to avoid being reused later.
-		// ------------------------------------------ //
+  if (reader_kernel.Blob()) {
+    // ------------------------------------------ //
+    // null these fields, to avoid being reused later.
+    // ------------------------------------------ //
 
-		auto kernel_thread = Boot::BootThread(reader_kernel.Blob());
+    auto kernel_thread = Boot::BootThread(reader_kernel.Blob());
 
-		kernel_thread.SetName("BootZ/NeKernel");
+    kernel_thread.SetName("BootZ/NeKernel");
 
-		handover_hdr->f_KernelImage = reader_kernel.Blob();
-		handover_hdr->f_KernelSz	= reader_kernel.Size();
+    handover_hdr->f_KernelImage = reader_kernel.Blob();
+    handover_hdr->f_KernelSz    = reader_kernel.Size();
 
-		kernel_thread.Start(handover_hdr, YES);
-	}
+    kernel_thread.Start(handover_hdr, YES);
+  }
 
-	Boot::BootFileReader reader_netboot(L"net.efi", image_handle);
-	reader_netboot.ReadAll(0);
+  Boot::BootFileReader reader_netboot(L"net.efi", image_handle);
+  reader_netboot.ReadAll(0);
 
-	if (!reader_netboot.Blob())
-		return kEfiFail;
+  if (!reader_netboot.Blob()) return kEfiFail;
 
-	auto netboot_thread = Boot::BootThread(reader_netboot.Blob());
-	netboot_thread.SetName("BootZ/BootNet");
+  auto netboot_thread = Boot::BootThread(reader_netboot.Blob());
+  netboot_thread.SetName("BootZ/BootNet");
 
-	return netboot_thread.Start(handover_hdr, NO);
+  return netboot_thread.Start(handover_hdr, NO);
 }
diff --git a/dev/boot/src/HEL/AMD64/BootPlatform.cc b/dev/boot/src/HEL/AMD64/BootPlatform.cc
index 1a1f9b89..8b4d57c4 100644
--- a/dev/boot/src/HEL/AMD64/BootPlatform.cc
+++ b/dev/boot/src/HEL/AMD64/BootPlatform.cc
@@ -1,50 +1,44 @@
 
 /* -------------------------------------------
 
-	Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
+  Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
 
 ------------------------------------------- */
 
+#include <BootKit/BootKit.h>
 #include <BootKit/Platform.h>
 #include <BootKit/Protocol.h>
-#include <BootKit/BootKit.h>
 
 #ifdef __BOOTZ_STANDALONE__
 
 using namespace Boot;
 
-EXTERN_C void rt_hlt()
-{
-	asm volatile("hlt");
+EXTERN_C void rt_hlt() {
+  asm volatile("hlt");
 }
 
-EXTERN_C void rt_cli()
-{
-	asm volatile("cli");
+EXTERN_C void rt_cli() {
+  asm volatile("cli");
 }
 
-EXTERN_C void rt_sti()
-{
-	asm volatile("sti");
+EXTERN_C void rt_sti() {
+  asm volatile("sti");
 }
 
-EXTERN_C void rt_cld()
-{
-	asm volatile("cld");
+EXTERN_C void rt_cld() {
+  asm volatile("cld");
 }
 
-EXTERN_C void rt_std()
-{
-	asm volatile("std");
+EXTERN_C void rt_std() {
+  asm volatile("std");
 }
 
 #else
 
 #include <HALKit/AMD64/Processor.h>
 
-void rt_hlt()
-{
-	Kernel::HAL::rt_halt();
+void rt_hlt() {
+  Kernel::HAL::rt_halt();
 }
 
-#endif // __BOOTZ_STANDALONE__
+#endif  // __BOOTZ_STANDALONE__
diff --git a/dev/boot/src/HEL/AMD64/BootSATA.cc b/dev/boot/src/HEL/AMD64/BootSATA.cc
index e60aebde..ef5d2096 100644
--- a/dev/boot/src/HEL/AMD64/BootSATA.cc
+++ b/dev/boot/src/HEL/AMD64/BootSATA.cc
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
+  Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
 
 ------------------------------------------- */
 
@@ -15,6 +15,6 @@
  *
  */
 
+#include <BootKit/HW/SATA.h>
 #include <BootKit/Platform.h>
 #include <BootKit/Protocol.h>
-#include <BootKit/HW/SATA.h>
diff --git a/dev/boot/src/HEL/ARM64/BootEFI.cc b/dev/boot/src/HEL/ARM64/BootEFI.cc
index 9132cec1..1e5b62f3 100644
--- a/dev/boot/src/HEL/ARM64/BootEFI.cc
+++ b/dev/boot/src/HEL/ARM64/BootEFI.cc
@@ -1,12 +1,11 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
+  Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
 
 ------------------------------------------- */
 
 #include <BootKit/BootKit.h>
-#include <modules/CoreGfx/CoreGfx.h>
-#include <modules/CoreGfx/TextGfx.h>
+#include <BootKit/BootThread.h>
 #include <FirmwareKit/EFI.h>
 #include <FirmwareKit/EFI/API.h>
 #include <FirmwareKit/Handover.h>
@@ -15,8 +14,8 @@
 #include <KernelKit/PEF.h>
 #include <NewKit/Macros.h>
 #include <NewKit/Ref.h>
-#include <BootKit/BootThread.h>
 #include <modules/CoreGfx/CoreGfx.h>
+#include <modules/CoreGfx/TextGfx.h>
 
 #ifndef kExpectedWidth
 #define kExpectedWidth (800)
@@ -28,43 +27,39 @@
 
 /** Graphics related. */
 
-STATIC EfiGraphicsOutputProtocol* kGop		 = nullptr;
-STATIC UInt16					  kGopStride = 0U;
-STATIC EfiGUID					  kGopGuid;
+STATIC EfiGraphicsOutputProtocol* kGop       = nullptr;
+STATIC UInt16                     kGopStride = 0U;
+STATIC EfiGUID                    kGopGuid;
 
 EXTERN_C Void rt_reset_hardware();
 
 EXTERN EfiBootServices* BS;
 
 /**
-	@brief Finds and stores the GOP object.
+  @brief Finds and stores the GOP object.
 */
-STATIC Bool boot_init_fb() noexcept
-{
-	kGopGuid = EfiGUID(EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID);
-	kGop	 = nullptr;
+STATIC Bool boot_init_fb() noexcept {
+  kGopGuid = EfiGUID(EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID);
+  kGop     = nullptr;
 
-	if (BS->LocateProtocol(&kGopGuid, nullptr, (VoidPtr*)&kGop) != kEfiOk)
-		return No;
+  if (BS->LocateProtocol(&kGopGuid, nullptr, (VoidPtr*) &kGop) != kEfiOk) return No;
 
-	kGopStride = 4;
+  kGopStride = 4;
 
-	for (SizeT i = 0; i < kGop->Mode->MaxMode; ++i)
-	{
-		EfiGraphicsOutputProtocolModeInformation* infoPtr = nullptr;
-		UInt32									  sz	  = 0U;
+  for (SizeT i = 0; i < kGop->Mode->MaxMode; ++i) {
+    EfiGraphicsOutputProtocolModeInformation* infoPtr = nullptr;
+    UInt32                                    sz      = 0U;
 
-		kGop->QueryMode(kGop, i, &sz, &infoPtr);
+    kGop->QueryMode(kGop, i, &sz, &infoPtr);
 
-		if (infoPtr->HorizontalResolution == kExpectedWidth &&
-			infoPtr->VerticalResolution == kExpectedHeight)
-		{
-			kGop->SetMode(kGop, i);
-			return Yes;
-		}
-	}
+    if (infoPtr->HorizontalResolution == kExpectedWidth &&
+        infoPtr->VerticalResolution == kExpectedHeight) {
+      kGop->SetMode(kGop, i);
+      return Yes;
+    }
+  }
 
-	return No;
+  return No;
 }
 
 EXTERN EfiBootServices* BS;
@@ -73,179 +68,167 @@ EXTERN EfiBootServices* BS;
 /// @param image_handle Handle of this image.
 /// @param sys_table The system table of it.
 /// @return nothing, never returns.
-EFI_EXTERN_C EFI_API Int32 BootloaderMain(EfiHandlePtr	  image_handle,
-										  EfiSystemTable* sys_table)
-{
-	fw_init_efi(sys_table); ///! Init the EFI library.
+EFI_EXTERN_C EFI_API Int32 BootloaderMain(EfiHandlePtr image_handle, EfiSystemTable* sys_table) {
+  fw_init_efi(sys_table);  ///! Init the EFI library.
 
-	HEL::BootInfoHeader* handover_hdr =
-		new HEL::BootInfoHeader();
+  HEL::BootInfoHeader* handover_hdr = new HEL::BootInfoHeader();
 
-	UInt32 map_key = 0;
+  UInt32 map_key = 0;
 
 #ifdef ZBA_USE_FB
-	if (!boot_init_fb())
-		return 1; ///! Init the GOP.
-
-	for (SizeT index_vt = 0; index_vt < sys_table->NumberOfTableEntries;
-		 ++index_vt)
-	{
-		Char* vendor_table = reinterpret_cast<Char*>(
-			sys_table->ConfigurationTable[index_vt].VendorTable);
-
-		// ACPI's 'RSD PTR', which contains the ACPI SDT (MADT, FACP...)
-		if (vendor_table[0] == 'R' && vendor_table[1] == 'S' &&
-			vendor_table[2] == 'D' && vendor_table[3] == ' ' &&
-			vendor_table[4] == 'P' && vendor_table[5] == 'T' &&
-			vendor_table[6] == 'R' && vendor_table[7] == ' ')
-		{
-			handover_hdr->f_HardwareTables.f_VendorPtr = (VoidPtr)vendor_table;
-			break;
-		}
-	}
+  if (!boot_init_fb()) return 1;  ///! Init the GOP.
+
+  for (SizeT index_vt = 0; index_vt < sys_table->NumberOfTableEntries; ++index_vt) {
+    Char* vendor_table =
+        reinterpret_cast<Char*>(sys_table->ConfigurationTable[index_vt].VendorTable);
+
+    // ACPI's 'RSD PTR', which contains the ACPI SDT (MADT, FACP...)
+    if (vendor_table[0] == 'R' && vendor_table[1] == 'S' && vendor_table[2] == 'D' &&
+        vendor_table[3] == ' ' && vendor_table[4] == 'P' && vendor_table[5] == 'T' &&
+        vendor_table[6] == 'R' && vendor_table[7] == ' ') {
+      handover_hdr->f_HardwareTables.f_VendorPtr = (VoidPtr) vendor_table;
+      break;
+    }
+  }
 
-	// ------------------------------------------ //
-	// draw background color.
-	// ------------------------------------------ //
+  // ------------------------------------------ //
+  // draw background color.
+  // ------------------------------------------ //
 
-	handover_hdr->f_GOP.f_The		   = kGop->Mode->FrameBufferBase;
-	handover_hdr->f_GOP.f_Width		   = kGop->Mode->Info->VerticalResolution;
-	handover_hdr->f_GOP.f_Height	   = kGop->Mode->Info->HorizontalResolution;
-	handover_hdr->f_GOP.f_PixelPerLine = kGop->Mode->Info->PixelsPerScanLine;
-	handover_hdr->f_GOP.f_PixelFormat  = kGop->Mode->Info->PixelFormat;
-	handover_hdr->f_GOP.f_Size		   = kGop->Mode->FrameBufferSize;
-#endif // ZBA_USE_FB
+  handover_hdr->f_GOP.f_The          = kGop->Mode->FrameBufferBase;
+  handover_hdr->f_GOP.f_Width        = kGop->Mode->Info->VerticalResolution;
+  handover_hdr->f_GOP.f_Height       = kGop->Mode->Info->HorizontalResolution;
+  handover_hdr->f_GOP.f_PixelPerLine = kGop->Mode->Info->PixelsPerScanLine;
+  handover_hdr->f_GOP.f_PixelFormat  = kGop->Mode->Info->PixelFormat;
+  handover_hdr->f_GOP.f_Size         = kGop->Mode->FrameBufferSize;
+#endif  // ZBA_USE_FB
 
-	// ------------------------------------------- //
-	// Grab MP services, extended to runtime.	   //
-	// ------------------------------------------- //
+  // ------------------------------------------- //
+  // Grab MP services, extended to runtime.	   //
+  // ------------------------------------------- //
 
-	EfiGUID				   guid_mp = EfiGUID(EFI_MP_SERVICES_PROTOCOL_GUID);
-	EfiMpServicesProtocol* mp	   = nullptr;
+  EfiGUID                guid_mp = EfiGUID(EFI_MP_SERVICES_PROTOCOL_GUID);
+  EfiMpServicesProtocol* mp      = nullptr;
 
-	BS->LocateProtocol(&guid_mp, nullptr, reinterpret_cast<VoidPtr*>(&mp));
-	handover_hdr->f_HardwareTables.f_MpPtr = reinterpret_cast<VoidPtr>(mp);
+  BS->LocateProtocol(&guid_mp, nullptr, reinterpret_cast<VoidPtr*>(&mp));
+  handover_hdr->f_HardwareTables.f_MpPtr = reinterpret_cast<VoidPtr>(mp);
 
-	// Assign to global 'kHandoverHeader'.
-	kHandoverHeader = handover_hdr;
+  // Assign to global 'kHandoverHeader'.
+  kHandoverHeader = handover_hdr;
 
-	fb_init();
+  fb_init();
 
-	FB::fb_clear_video();
+  FB::fb_clear_video();
 
-	FBDrawBitMapInRegion(zka_disk, NE_DISK_WIDTH, NE_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_DISK_HEIGHT) / 2);
+  FBDrawBitMapInRegion(zka_disk, NE_DISK_WIDTH, NE_DISK_HEIGHT,
+                       (kHandoverHeader->f_GOP.f_Width - NE_DISK_WIDTH) / 2,
+                       (kHandoverHeader->f_GOP.f_Height - NE_DISK_HEIGHT) / 2);
 
-	fb_clear();
+  fb_clear();
 
-	UInt32 cnt_enabled	= 0;
-	UInt32 cnt_disabled = 0;
+  UInt32 cnt_enabled  = 0;
+  UInt32 cnt_disabled = 0;
 
-	if (mp)
-	{
-		mp->GetNumberOfProcessors(mp, &cnt_disabled, &cnt_enabled);
-		handover_hdr->f_HardwareTables.f_MultiProcessingEnabled = cnt_enabled > 1;
-	}
-	else
-	{
-		handover_hdr->f_HardwareTables.f_MultiProcessingEnabled = NO;
-	}
+  if (mp) {
+    mp->GetNumberOfProcessors(mp, &cnt_disabled, &cnt_enabled);
+    handover_hdr->f_HardwareTables.f_MultiProcessingEnabled = cnt_enabled > 1;
+  } else {
+    handover_hdr->f_HardwareTables.f_MultiProcessingEnabled = NO;
+  }
 
-	//-------------------------------------------------------------//
-	// Allocate heap.
-	//-------------------------------------------------------------//
+  //-------------------------------------------------------------//
+  // Allocate heap.
+  //-------------------------------------------------------------//
 
-	Boot::BootTextWriter writer;
+  Boot::BootTextWriter writer;
 
-	handover_hdr->f_BitMapStart = nullptr;			 /* Start of bitmap. */
-	handover_hdr->f_BitMapSize	= kHandoverBitMapSz; /* Size of bitmap in bytes. */
-	Int32 trials				= 5 * 10000000;
+  handover_hdr->f_BitMapStart = nullptr;           /* Start of bitmap. */
+  handover_hdr->f_BitMapSize  = kHandoverBitMapSz; /* Size of bitmap in bytes. */
+  Int32 trials                = 5 * 10000000;
 
-	while (BS->AllocatePool(EfiLoaderData, handover_hdr->f_BitMapSize, &handover_hdr->f_BitMapStart) != kEfiOk)
-	{
-		--trials;
+  while (BS->AllocatePool(EfiLoaderData, handover_hdr->f_BitMapSize,
+                          &handover_hdr->f_BitMapStart) != kEfiOk) {
+    --trials;
 
-		if (!trials)
-		{
-			writer.Write("BootZ: Unable to allocate sufficent memory, trying again with 2GB...\r");
+    if (!trials) {
+      writer.Write("BootZ: Unable to allocate sufficent memory, trying again with 2GB...\r");
 
-			trials = 3 * 10000000;
+      trials = 3 * 10000000;
 
-			handover_hdr->f_BitMapSize = kHandoverBitMapSz / 2; /* Size of bitmap in bytes. */
+      handover_hdr->f_BitMapSize = kHandoverBitMapSz / 2; /* Size of bitmap in bytes. */
 
-			while (BS->AllocatePool(EfiLoaderData, handover_hdr->f_BitMapSize, &handover_hdr->f_BitMapStart) != kEfiOk)
-			{
-				--trials;
+      while (BS->AllocatePool(EfiLoaderData, handover_hdr->f_BitMapSize,
+                              &handover_hdr->f_BitMapStart) != kEfiOk) {
+        --trials;
 
-				if (!trials)
-				{
-					writer.Write("BootZ: Unable to allocate sufficent memory, aborting...\r");
-					Boot::Stop();
-				}
-			}
-		}
-	}
+        if (!trials) {
+          writer.Write("BootZ: Unable to allocate sufficent memory, aborting...\r");
+          Boot::Stop();
+        }
+      }
+    }
+  }
 
-	Boot::BootFileReader reader_syschk(L"chk.efi", image_handle);
-	reader_syschk.ReadAll(0);
+  Boot::BootFileReader reader_syschk(L"chk.efi", image_handle);
+  reader_syschk.ReadAll(0);
 
-	Boot::BootThread* syschk_thread = nullptr;
+  Boot::BootThread* syschk_thread = nullptr;
 
-	if (reader_syschk.Blob())
-	{
-		syschk_thread = new Boot::BootThread(reader_syschk.Blob());
-		syschk_thread->SetName("BootZ: System Check");
+  if (reader_syschk.Blob()) {
+    syschk_thread = new Boot::BootThread(reader_syschk.Blob());
+    syschk_thread->SetName("BootZ: System Check");
 
-		if (syschk_thread->Start(handover_hdr, NO) != kEfiOk)
-		{
-			fb_init();
+    if (syschk_thread->Start(handover_hdr, NO) != kEfiOk) {
+      fb_init();
 
-			FB::fb_clear_video();
+      FB::fb_clear_video();
 
-			FBDrawBitMapInRegion(zka_no_disk, NE_NO_DISK_WIDTH, NE_NO_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_NO_DISK_HEIGHT) / 2);
+      FBDrawBitMapInRegion(zka_no_disk, NE_NO_DISK_WIDTH, NE_NO_DISK_HEIGHT,
+                           (kHandoverHeader->f_GOP.f_Width - NE_NO_DISK_WIDTH) / 2,
+                           (kHandoverHeader->f_GOP.f_Height - NE_NO_DISK_HEIGHT) / 2);
 
-			fb_clear();
-		}
-	}
+      fb_clear();
+    }
+  }
 
-	// ------------------------------------------ //
-	// null these fields, to avoid being reused later.
-	// ------------------------------------------ //
+  // ------------------------------------------ //
+  // null these fields, to avoid being reused later.
+  // ------------------------------------------ //
 
-	handover_hdr->f_FirmwareCustomTables[0] = nullptr;
-	handover_hdr->f_FirmwareCustomTables[1] = nullptr;
+  handover_hdr->f_FirmwareCustomTables[0] = nullptr;
+  handover_hdr->f_FirmwareCustomTables[1] = nullptr;
 
-	handover_hdr->f_FirmwareVendorLen = Boot::BStrLen(sys_table->FirmwareVendor);
+  handover_hdr->f_FirmwareVendorLen = Boot::BStrLen(sys_table->FirmwareVendor);
 
-	handover_hdr->f_Magic	= kHandoverMagic;
-	handover_hdr->f_Version = kHandoverVersion;
+  handover_hdr->f_Magic   = kHandoverMagic;
+  handover_hdr->f_Version = kHandoverVersion;
 
-	// Provide fimware vendor name.
+  // Provide fimware vendor name.
 
-	Boot::BCopyMem(handover_hdr->f_FirmwareVendorName, sys_table->FirmwareVendor,
-				   handover_hdr->f_FirmwareVendorLen);
+  Boot::BCopyMem(handover_hdr->f_FirmwareVendorName, sys_table->FirmwareVendor,
+                 handover_hdr->f_FirmwareVendorLen);
 
-	handover_hdr->f_FirmwareVendorLen = Boot::BStrLen(sys_table->FirmwareVendor);
+  handover_hdr->f_FirmwareVendorLen = Boot::BStrLen(sys_table->FirmwareVendor);
 
-	Boot::BootFileReader reader_kernel(L"krnl.efi", image_handle);
+  Boot::BootFileReader reader_kernel(L"krnl.efi", image_handle);
 
-	reader_kernel.ReadAll(0);
+  reader_kernel.ReadAll(0);
 
-	// ------------------------------------------ //
-	// If we succeed in reading the blob, then execute it.
-	// ------------------------------------------ //
+  // ------------------------------------------ //
+  // If we succeed in reading the blob, then execute it.
+  // ------------------------------------------ //
 
-	if (reader_kernel.Blob())
-	{
-		auto kernel_thread = Boot::BootThread(reader_kernel.Blob());
-		kernel_thread.SetName("BootZ: Kernel.");
+  if (reader_kernel.Blob()) {
+    auto kernel_thread = Boot::BootThread(reader_kernel.Blob());
+    kernel_thread.SetName("BootZ: Kernel.");
 
-		handover_hdr->f_KernelImage = reader_kernel.Blob();
-		handover_hdr->f_KernelSz	= reader_kernel.Size();
+    handover_hdr->f_KernelImage = reader_kernel.Blob();
+    handover_hdr->f_KernelSz    = reader_kernel.Size();
 
-		Boot::ExitBootServices(map_key, image_handle);
+    Boot::ExitBootServices(map_key, image_handle);
 
-		kernel_thread.Start(handover_hdr, YES);
-	}
+    kernel_thread.Start(handover_hdr, YES);
+  }
 
-	CANT_REACH();
+  CANT_REACH();
 }
diff --git a/dev/boot/src/HEL/ARM64/BootPlatform.cc b/dev/boot/src/HEL/ARM64/BootPlatform.cc
index bf359c6c..0f6a738f 100644
--- a/dev/boot/src/HEL/ARM64/BootPlatform.cc
+++ b/dev/boot/src/HEL/ARM64/BootPlatform.cc
@@ -1,37 +1,27 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
+  Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
 
 ------------------------------------------- */
 
+#include <BootKit/BootKit.h>
 #include <BootKit/Platform.h>
 #include <BootKit/Protocol.h>
-#include <BootKit/BootKit.h>
 
 #ifdef __BOOTZ_STANDALONE__
 
 using namespace Boot;
 
-EXTERN_C void rt_hlt()
-{
-	while (Yes)
-		;
+EXTERN_C void rt_hlt() {
+  while (Yes);
 }
 
-EXTERN_C void rt_cli()
-{
-}
+EXTERN_C void rt_cli() {}
 
-EXTERN_C void rt_sti()
-{
-}
+EXTERN_C void rt_sti() {}
 
-EXTERN_C void rt_cld()
-{
-}
+EXTERN_C void rt_cld() {}
 
-EXTERN_C void rt_std()
-{
-}
+EXTERN_C void rt_std() {}
 
-#endif // __BOOTZ_STANDALONE__
+#endif  // __BOOTZ_STANDALONE__