IMP: Add FreeBitMap method in IBitMapAllocator.

IMP: Using a better memory strategy than a pre-allocated chunk of memory.
FIX: Moved compile_flags.txt only at root directory.
FIX: Refactor HandoverInformationHeader to HANDOVER_INFO_HEADER.
IMP: Handover version 1.16.

Signed-off-by: Amlal <amlal@el-mahrouss-logic.com>

42 files changed, 106 insertions, 1492 deletions

diff --git a/dev/DDK/compile_flags.txt b/dev/DDK/compile_flags.txt
deleted file mode 100644
index 48dfa8fe..00000000
--- a/dev/DDK/compile_flags.txt
+++ /dev/null
@@ -1,2 +0,0 @@
--std=c17
--I../
diff --git a/dev/DLL/RunDLL64/Sources/compile_flags.txt b/dev/DLL/RunDLL64/Sources/compile_flags.txt
deleted file mode 100644
index 53118879..00000000
--- a/dev/DLL/RunDLL64/Sources/compile_flags.txt
+++ /dev/null
@@ -1 +0,0 @@
--I../../SCI
diff --git a/dev/DLL/RunXPCOM/Sources/compile_flags.txt b/dev/DLL/RunXPCOM/Sources/compile_flags.txt
deleted file mode 100644
index 53118879..00000000
--- a/dev/DLL/RunXPCOM/Sources/compile_flags.txt
+++ /dev/null
@@ -1 +0,0 @@
--I../../SCI
diff --git a/dev/HPFS/Sources/compile_flags.txt b/dev/HPFS/Sources/compile_flags.txt
deleted file mode 100644
index 7c66a118..00000000
--- a/dev/HPFS/Sources/compile_flags.txt
+++ /dev/null
@@ -1 +0,0 @@
--I../../
diff --git a/dev/SCI/compile_flags.txt b/dev/SCI/compile_flags.txt
deleted file mode 100644
index 509e3eed..00000000
--- a/dev/SCI/compile_flags.txt
+++ /dev/null
@@ -1,4 +0,0 @@
--I./

--I../Kernel

--I../

--std=c++20

diff --git a/dev/ZBA/BootKit/Thread.hxx b/dev/ZBA/BootKit/Thread.hxx
index 558dc9f0..13bd558a 100644
--- a/dev/ZBA/BootKit/Thread.hxx
+++ b/dev/ZBA/BootKit/Thread.hxx
@@ -29,7 +29,7 @@ namespace Boot
 		BThread& operator=(const BThread&) = default;
 		BThread(const BThread&)			   = default;
 
-		void		Start(HEL::HandoverInformationHeader* handover);
+		void		Start(HEL::HANDOVER_INFO_HEADER* handover);
 		const char* GetName();
 		void		SetName(const char* name);
 		bool		IsValid();
diff --git a/dev/ZBA/BootKit/Vendor/Qr.hxx b/dev/ZBA/BootKit/Vendor/Qr.hxx
deleted file mode 100644
index 77a5a802..00000000
--- a/dev/ZBA/BootKit/Vendor/Qr.hxx
+++ /dev/null
@@ -1,982 +0,0 @@
-#ifndef QR_HXX
-#define QR_HXX
-
-extern "C"
-{
-
-#include <math.h>
-#include <stddef.h>
-#include <stdint.h>
-}
-
-#include <BootKit/Vendor/Shared/base.h>
-#include <BootKit/Vendor/Shared/bit.h>
-
-#include <BootKit/Vendor/QrPrelude.hxx>
-#include <BootKit/Support.hxx>
-
-#include <Modules/CoreCG/FbRenderer.hxx>
-#include <CompilerKit/Detail.hxx>
-
-/// @note the QR code is still code 128, it utilizes the same concept of having it's own character set.
-
-namespace qr
-{
-	inline uint8_t min_poly =
-					   0b11101, /* Minimal polynomial x^8 + x^4 + x^3 + x^2 + 1 */
-		generator = 0b10;		/* Generator of Galois field */
-
-	/// @brief galois finite field multiplication.
-	inline uint8_t gf_mul(uint8_t a, uint8_t b)
-	{
-		uint8_t res = 0;
-
-		for (; b; b >>= 1)
-		{
-			if (b & 1)
-				res ^= a;
-			if (a & 0x80)
-				a = (a << 1) ^ min_poly;
-			else
-				a <<= 1;
-		}
-
-		return res;
-	}
-
-	// Size of Ecc block with respect to level and version. 0 version is for
-	// padding.
-	constexpr int ECC_CODEWORDS_PER_BLOCK[4][41] = {
-		{0, 7, 10, 15, 20, 26, 18, 20, 24, 30, 18, 20, 24, 26,
-		 30, 22, 24, 28, 30, 28, 28, 28, 28, 30, 30, 26, 28, 30,
-		 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30},
-		{0, 10, 16, 26, 18, 24, 16, 18, 22, 22, 26, 30, 22, 22,
-		 24, 24, 28, 28, 26, 26, 26, 26, 28, 28, 28, 28, 28, 28,
-		 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28},
-		{0, 13, 22, 18, 26, 18, 24, 18, 22, 20, 24, 28, 26, 24,
-		 20, 30, 24, 28, 28, 26, 30, 28, 30, 30, 30, 30, 28, 30,
-		 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30},
-		{0, 17, 28, 22, 16, 22, 28, 26, 26, 24, 28, 24, 28, 22,
-		 24, 24, 30, 28, 28, 26, 28, 30, 24, 30, 30, 30, 30, 30,
-		 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30},
-	};
-
-	// Number of Ecc blocks with respect to level and version. 0 version is for
-	// padding.
-	constexpr int N_ECC_BLOCKS[4][41] = {
-		{0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 4, 4, 4, 4,
-		 4, 6, 6, 6, 6, 7, 8, 8, 9, 9, 10, 12, 12, 12,
-		 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 22, 24, 25},
-		{0, 1, 1, 1, 2, 2, 4, 4, 4, 5, 5, 5, 8, 9,
-		 9, 10, 10, 11, 13, 14, 16, 17, 17, 18, 20, 21, 23, 25,
-		 26, 28, 29, 31, 33, 35, 37, 38, 40, 43, 45, 47, 49},
-		{0, 1, 1, 2, 2, 4, 4, 6, 6, 8, 8, 8, 10, 12,
-		 16, 12, 17, 16, 18, 21, 20, 23, 23, 25, 27, 29, 34, 34,
-		 35, 38, 40, 43, 45, 48, 51, 53, 56, 59, 62, 65, 68},
-		{0, 1, 1, 2, 4, 4, 4, 5, 6, 8, 8, 11, 11, 16,
-		 16, 18, 16, 19, 21, 25, 25, 25, 34, 30, 32, 35, 37, 40,
-		 42, 45, 48, 51, 54, 57, 60, 63, 66, 70, 74, 77, 81},
-	};
-
-	// Positions of central modules of alignment patterns according to version. 0
-	// version is for padding.
-	constexpr int ALIGN_POS[41][7] = {
-		{},
-		{0},
-		{6, 18},
-		{6, 22},
-		{6, 26},
-		{6, 30},
-		{6, 34},
-		{6, 22, 38},
-		{6, 24, 42},
-		{6, 26, 46},
-		{6, 28, 50},
-		{6, 30, 54},
-		{6, 32, 58},
-		{6, 34, 62},
-		{6, 26, 46, 66},
-		{6, 26, 48, 70},
-		{6, 26, 50, 74},
-		{6, 30, 54, 78},
-		{6, 30, 56, 82},
-		{6, 30, 58, 86},
-		{6, 34, 62, 90},
-		{6, 28, 50, 72, 94},
-		{6, 26, 50, 74, 98},
-		{6, 30, 54, 78, 102},
-		{6, 28, 54, 80, 106},
-		{6, 32, 58, 84, 110},
-		{6, 30, 58, 86, 114},
-		{6, 34, 62, 90, 118},
-		{6, 26, 50, 74, 98, 122},
-		{6, 30, 54, 78, 102, 126},
-		{6, 26, 52, 78, 104, 130},
-		{6, 30, 56, 82, 108, 134},
-		{6, 34, 60, 86, 112, 138},
-		{6, 30, 58, 86, 114, 142},
-		{6, 34, 62, 90, 118, 146},
-		{6, 30, 54, 78, 102, 126, 150},
-		{6, 24, 50, 76, 102, 128, 154},
-		{6, 28, 54, 80, 106, 132, 158},
-		{6, 32, 58, 84, 110, 136, 162},
-		{6, 26, 54, 82, 110, 138, 166},
-		{6, 30, 58, 86, 114, 142, 170},
-	};
-
-	// Return n-th bit of arr starting from MSB.
-	constexpr uint8_t get_bit_r(uint8_t* arr, int n)
-	{
-		return (arr[n >> 3] >> (7 - (n & 7))) & 1;
-	}
-
-	// Add up to 16 bits to arr. Data starts from MSB as well as each byte of an
-	// array.
-	constexpr void add_bits(uint16_t data, int n, uint8_t* arr, size_t& pos)
-	{
-		while (n--)
-		{
-			arr[pos >> 3] |= ((data >> n) & 1) << (7 - (pos & 7));
-			++pos;
-		}
-	}
-
-	// Translate char to alphanumeric encoding value,
-	constexpr int alphanumeric(char c)
-	{
-		if (c >= '0' && c <= '9')
-			return c - '0';
-
-		if (c >= 'A' && c <= 'Z')
-			return c - 'A' + 10;
-
-		switch (c)
-		{
-		case ' ':
-			return 36;
-		case '$':
-			return 37;
-		case '%':
-			return 38;
-		case '*':
-			return 39;
-		case '+':
-			return 40;
-		case '-':
-			return 41;
-		case '.':
-			return 42;
-		case '/':
-			return 43;
-		case ':':
-			return 44;
-		}
-		return -1;
-	}
-
-	// Check if string can be encoded in alphanumeric mode.
-	constexpr bool is_alphanumeric(const char* str, size_t len)
-	{
-		for (size_t i = 0; i < len; ++i)
-			if (alphanumeric(str[i]) == -1)
-				return false;
-		return true;
-	}
-
-	// Check if string can be encoded in numeric mode.
-	constexpr bool is_numeric(const char* str, size_t len)
-	{
-		for (size_t i = 0; i < len; ++i)
-			if (str[i] < '0' || str[i] > '9')
-				return false;
-		return true;
-	}
-
-	// Check if string can be encoded in kanji mode.
-	constexpr bool is_kanji(const char* str, size_t len)
-	{
-		for (size_t i = 0; i < len; i += 2)
-		{
-			uint16_t val = uint16_t(str[i]) | (uint16_t(str[i + 1]) << 8);
-			if (val < 0x8140 || val > 0xebbf || (val > 0x9ffc && val < 0xe040))
-				return false;
-		}
-		return true;
-	}
-
-	// Reed-Solomon Ecc generator polynomial for the given degree.
-	inline void gf_gen_poly(int degree, uint8_t* poly)
-	{
-		SetMem(poly, 0, degree);
-
-		uint8_t root = poly[degree - 1] = 1;
-
-		for (int i = 0; i < degree; ++i)
-		{
-			for (int j = 0; j < degree - 1; ++j)
-				poly[j] = gf_mul(poly[j], root) ^ poly[j + 1];
-			poly[degree - 1] = gf_mul(poly[degree - 1], root);
-			root			 = (root << 1) ^ ((root >> 7) * 0x11d);
-		}
-	}
-
-	// Polynomial division if Galois Field.
-	inline void gf_poly_div(uint8_t* dividend, size_t len, uint8_t* divisor, int degree, uint8_t* result)
-	{
-		SetMem(result, 0, degree);
-
-		for (size_t i = 0; i < len; ++i)
-		{
-			uint8_t factor = dividend[i] ^ result[0];
-			MoveMem(&result[0], &result[1], degree - 1);
-			result[degree - 1] = 0;
-			for (int j = 0; j < degree; ++j)
-				result[j] ^= gf_mul(divisor[j], factor);
-		}
-	}
-
-	enum Ecc
-	{
-		L,
-		M,
-		Q,
-		H,
-	};
-
-	enum Mode
-	{
-		M_NUMERIC,
-		M_ALPHANUMERIC,
-		M_BYTE,
-		M_KANJI,
-	};
-
-	// Select appropriate encoding mode for string.
-	constexpr Mode select_mode(const char* str, size_t len)
-	{
-		if (is_numeric(str, len))
-			return M_NUMERIC;
-		if (is_alphanumeric(str, len))
-			return M_ALPHANUMERIC;
-		if (is_kanji(str, len))
-			return M_KANJI;
-		return M_BYTE;
-	}
-
-	// Return size of Character Control Indicator in bits for given version and
-	// mode.
-	constexpr int cci(int ver, Mode mode)
-	{
-		constexpr int cnt[4][3] = {
-			{10, 12, 14},
-			{9, 11, 13},
-			{8, 16, 16},
-			{8, 10, 12},
-		};
-		if (ver < 10)
-			return cnt[mode][0];
-		if (ver < 27)
-			return cnt[mode][1];
-		return cnt[mode][2];
-	}
-
-	template <int V>
-	struct Qr
-	{
-	private:
-		friend class QrDelegate;
-		bool draw(int x, int y) noexcept;
-
-	public:
-		constexpr auto side_size() const
-		{
-			return SIDE;
-		}
-
-		bool module(int x, int y);
-		bool encode(const char* str, size_t len, Ecc ecc, int mask = -1);
-
-	private:
-		bool encode_data(const char* data, size_t len, Ecc ecc, uint8_t* out);
-		void encode_ecc(uint8_t* data, Ecc ecc, uint8_t* out);
-
-		void add_data(uint8_t* data, uint8_t* patterns);
-		void add_patterns();
-		void add_version();
-		void add_format(Ecc ecc, int mask);
-		void reserve_patterns(uint8_t* out);
-
-		template <bool Black>
-		void draw_rect(int y, int x, int height, int width, uint8_t* out);
-		template <bool Black>
-		void draw_bound(int y, int x, int height, int width, uint8_t* out);
-
-		template <bool Horizontal>
-		int	 rule_1_3_score();
-		int	 penalty_score();
-		int	 select_mask(Ecc ecc, uint8_t* patterns);
-		void apply_mask(int mask, uint8_t* patterns);
-
-	private:
-		static_assert(V >= 1 && V <= 40, "invalid version");
-		static constexpr int SIDE		  = 17 + V * 4;
-		static constexpr int N_BITS		  = SIDE * SIDE;
-		static constexpr int N_ALIGN	  = V == 1 ? 0 : V / 7 + 2;
-		static constexpr int N_ALIGN_BITS = V > 1 ? (N_ALIGN* N_ALIGN - 3) * 25 : 0;
-		static constexpr int N_TIMING_BITS =
-			(SIDE - 16) * 2 - (10 * (V > 1 ? N_ALIGN - 2 : 0));
-		static constexpr int N_VER_BITS = V > 6 ? 36 : 0;
-		static constexpr int N_DAT_BITS =
-			N_BITS - (192 + N_ALIGN_BITS + N_TIMING_BITS + 31 + N_VER_BITS);
-		static constexpr int N_BYTES = utl::bytes_in_bits(N_BITS);		   // Actual number of bytes_in_bits
-																		   // required to store whole Qr code
-		static constexpr int N_DAT_BYTES = utl::bytes_in_bits(N_DAT_BITS); // Actual number of bytes_in_bits required to store
-																		   // [data + ecc]
-		static constexpr int N_DAT_CAPACITY =
-			N_DAT_BITS >> 3; // Capacity of [data + ecc] without remainder bits
-	private:
-		/// @brief internal function to retrieve bit from a bitset.
-		uint8_t get_arr_bit(uint8_t* arr, unsigned bit) const
-		{
-			return utl::get_arr_bit(arr, bit);
-		}
-
-		/// @brief internal function to set bit from a bitset.
-		void set_arr_bit(uint8_t* arr, unsigned bit)
-		{
-			utl::set_arr_bit(arr, bit);
-		}
-
-		/// @brief internal function to clear bit from a bitset.
-		void clr_arr_bit(uint8_t* arr, unsigned bit)
-		{
-			utl::clr_arr_bit(arr, bit);
-		}
-
-		uint8_t code[N_BYTES] = {};
-
-		bool status = false;
-	};
-
-	// Get color of a module from left-to-right and top-to-bottom. Black is true.
-	template <int V>
-	bool Qr<V>::module(int x, int y)
-	{
-		return get_arr_bit(code, y * SIDE + x);
-	}
-
-	/// @brief draw a new QR code.
-	template <int V>
-	bool Qr<V>::draw(int whereX, int whereY) noexcept
-	{
-		if (!this->status)
-			return false; // it may be invalid.
-
-		CGInit();
-
-		for (int y = 0; y < (this->side_size()); ++y)
-		{
-			for (int x = 0; x < (this->side_size()); ++x)
-			{
-				CGDrawInRegion(
-					(this->module(x, y) ? RGB(00, 00, 00) : RGB(0xFF, 0xFF, 0xFF)),
-					1, 1,
-					x + whereX, y + whereY);
-			}
-		}
-
-		CGFini();
-
-		return true;
-	}
-
-	// Create Qr code with given error correction level. If mask == -1,
-	// then best mask selected automatically. NOTE: Automatic mask is the
-	// most expensive operation. Takes about 95 % of all computation time.
-	template <int V>
-	bool Qr<V>::encode(const char* str, size_t len, Ecc ecc, int mask)
-	{
-		uint8_t data[N_DAT_BYTES]		   = {};
-		uint8_t data_with_ecc[N_DAT_BYTES] = {};
-		uint8_t patterns[N_BYTES]		   = {};
-
-		if (!encode_data(str, len, ecc, data))
-		{
-			return status = false;
-		}
-
-		encode_ecc(data, ecc, data_with_ecc);
-
-		reserve_patterns(patterns);
-		CopyMem(code, patterns, N_BYTES);
-
-		add_data(data_with_ecc, patterns);
-		add_patterns();
-		add_version();
-
-		mask = mask != -1 ? mask & 7 : select_mask(ecc, patterns);
-
-		add_format(ecc, mask);
-		apply_mask(mask, patterns);
-
-		return status = true;
-	}
-
-	template <int V>
-	bool Qr<V>::encode_data(const char* data, size_t len, Ecc ecc, uint8_t* out)
-	{
-		Mode mode = select_mode(data, len);
-
-		size_t n_bits =
-			(N_DAT_CAPACITY - ECC_CODEWORDS_PER_BLOCK[ecc][V] * N_ECC_BLOCKS[ecc][V])
-			<< 3;
-		size_t pos = 0;
-
-		add_bits(1 << mode, 4, out, pos);
-		add_bits(len, cci(V, mode), out, pos);
-
-		if (mode == M_NUMERIC)
-		{
-			const size_t triplets	   = len / 3;
-			const size_t triplets_size = triplets * 3;
-			const size_t rem		   = len % 3;
-			const size_t rem_bits	   = rem == 2 ? 7 : rem == 1 ? 4
-																 : 0;
-			const size_t total_size	   = 10 * triplets + rem_bits;
-
-			if (pos + total_size > n_bits)
-				return false;
-
-			char buf[4] = {};
-
-			for (size_t i = 0; i < triplets_size; i += 3)
-			{
-				buf[0] = data[i];
-				buf[1] = data[i + 1];
-				buf[2] = data[i + 2];
-
-				uint16_t num = StringToLong(buf, NULL, 10);
-				add_bits(num, 10, out, pos);
-			}
-
-			if (rem)
-			{
-				buf[0]	 = data[triplets_size];
-				buf[1]	 = data[triplets_size + 1];
-				buf[rem] = 0;
-
-				uint16_t num = StringToLong(buf, NULL, 10);
-				add_bits(num, rem_bits, out, pos);
-			}
-		}
-		else if (mode == M_ALPHANUMERIC)
-		{
-			if (pos + 11 * (int(len & ~1ul) / 2) > n_bits)
-				return false;
-
-			for (int i = 0; i < int(len & ~1ul); i += 2)
-			{
-				uint16_t num = alphanumeric(data[i]) * 45 + alphanumeric(data[i + 1]);
-				add_bits(num, 11, out, pos);
-			}
-			if (len & 1)
-			{
-				if (pos + 6 > n_bits)
-					return false;
-
-				add_bits(alphanumeric(data[len - 1]), 6, out, pos);
-			}
-		}
-		else if (mode == M_BYTE)
-		{
-			if (pos + len * 8 > n_bits)
-				return false;
-
-			for (size_t i = 0; i < len; ++i)
-				add_bits(data[i], 8, out, pos);
-		}
-		else
-		{
-			if (pos + 13 * (len / 2) > n_bits)
-				return false;
-
-			for (size_t i = 0; i < len; i += 2)
-			{
-				uint16_t val = ((uint8_t)data[i]) | (((uint8_t)data[i + 1]) << 8);
-				uint16_t res = 0;
-				val -= val < 0x9FFC ? 0x8140 : 0xC140;
-				res += val & 0xff;
-				res += (val >> 8) * 0xc0;
-				add_bits(res, 13, out, pos);
-			}
-		}
-
-		size_t padding = n_bits - pos;
-		size_t i	   = 0;
-
-		add_bits(0, padding > 4 ? 4 : padding, out, pos);
-
-		if (pos & 7)
-			add_bits(0, (8 - pos) & 7, out, pos);
-
-		while (pos < n_bits)
-			add_bits(++i & 1 ? 0xec : 0x11, 8, out, pos);
-
-		return true;
-	}
-
-	template <int V>
-	void Qr<V>::encode_ecc(uint8_t* data, Ecc ecc, uint8_t* out)
-	{
-		int n_blocks = N_ECC_BLOCKS[ecc][V];
-		int ecc_len	 = ECC_CODEWORDS_PER_BLOCK[ecc][V];
-
-		int n_data_bytes = N_DAT_CAPACITY - ecc_len * n_blocks;
-
-		int n_short_blocks = n_blocks - N_DAT_CAPACITY % n_blocks;
-		int short_len	   = N_DAT_CAPACITY / n_blocks - ecc_len;
-
-		uint8_t gen_poly[30];
-		uint8_t ecc_buf[30];
-
-		gf_gen_poly(ecc_len, gen_poly);
-
-		uint8_t* data_ptr = data;
-
-		for (int i = 0; i < n_blocks; ++i)
-		{
-			int data_len = short_len;
-
-			if (i >= n_short_blocks)
-				++data_len;
-
-			gf_poly_div(data_ptr, data_len, gen_poly, ecc_len, ecc_buf);
-
-			for (int j = 0, k = i; j < data_len; ++j, k += n_blocks)
-			{
-				if (j == short_len)
-					k -= n_short_blocks;
-				out[k] = data_ptr[j];
-			}
-			for (int j = 0, k = n_data_bytes + i; j < ecc_len; ++j, k += n_blocks)
-				out[k] = ecc_buf[j];
-
-			data_ptr += data_len;
-		}
-	}
-
-	template <int V>
-	void Qr<V>::add_data(uint8_t* data, uint8_t* patterns)
-	{
-		int data_pos = 0;
-
-		for (int x = SIDE - 1; x >= 1; x -= 2)
-		{
-			if (x == 6)
-				x = 5;
-
-			for (int i = 0; i < SIDE; ++i)
-			{
-				int y	  = !((x + 1) & 2) ? SIDE - 1 - i : i;
-				int coord = y * SIDE + x;
-
-				if (!get_arr_bit(patterns, coord))
-				{
-					if (get_bit_r(data, data_pos))
-						set_arr_bit(code, coord);
-
-					++data_pos;
-				}
-
-				if (!get_arr_bit(patterns, coord - 1))
-				{
-					if (get_bit_r(data, data_pos))
-						set_arr_bit(code, coord - 1);
-
-					++data_pos;
-				}
-			}
-		}
-	}
-
-	template <int V>
-	void Qr<V>::add_patterns()
-	{
-		// White bounds inside finders
-		draw_bound<false>(1, 1, 5, 5, code);
-		draw_bound<false>(1, SIDE - 6, 5, 5, code);
-		draw_bound<false>(SIDE - 6, 1, 5, 5, code);
-
-		// Finish alignment patterns
-		for (int i = 0; i < N_ALIGN; ++i)
-		{
-			for (int j = 0; j < N_ALIGN; ++j)
-			{
-				if ((!i && !j) || (!i && j == N_ALIGN - 1) || (!j && i == N_ALIGN - 1))
-					continue;
-				draw_bound<false>(ALIGN_POS[V][i] - 1, ALIGN_POS[V][j] - 1, 3, 3, code);
-			}
-		}
-
-		// Draw white separators
-		draw_rect<false>(7, 0, 1, 8, code);
-		draw_rect<false>(0, 7, 8, 1, code);
-		draw_rect<false>(SIDE - 8, 0, 1, 8, code);
-		draw_rect<false>(SIDE - 8, 7, 8, 1, code);
-		draw_rect<false>(7, SIDE - 8, 1, 8, code);
-		draw_rect<false>(0, SIDE - 8, 8, 1, code);
-
-		// Perforate timing patterns
-		for (int i = 7; i < SIDE - 7; i += 2)
-		{
-			clr_arr_bit(code, 6 * SIDE + i);
-			clr_arr_bit(code, i * SIDE + 6);
-		}
-	}
-
-	template <int V>
-	void Qr<V>::add_version()
-	{
-		if (V < 7)
-			return;
-
-		uint32_t rem = V;
-
-		for (uint8_t i = 0; i < 12; ++i)
-			rem = (rem << 1) ^ ((rem >> 11) * 0x1F25);
-
-		uint32_t data = V << 12 | rem;
-
-		for (int x = 0; x < 6; ++x)
-		{
-			for (int j = 0; j < 3; ++j)
-			{
-				int y = SIDE - 11 + j;
-
-				bool black = (data >> (x * 3 + j)) & 1;
-
-				if (!black)
-				{
-					clr_arr_bit(code, y * SIDE + x);
-					clr_arr_bit(code, y + SIDE * x);
-				}
-			}
-		}
-	}
-
-	template <int V>
-	void Qr<V>::add_format(Ecc ecc, int mask)
-	{
-		int data = (ecc ^ 1) << 3 | mask;
-		int rem	 = data;
-
-		for (int i = 0; i < 10; i++)
-			rem = (rem << 1) ^ ((rem >> 9) * 0b10100110111);
-
-		int res = (data << 10 | rem) ^ 0b101010000010010;
-
-		for (int i = 0; i < 6; ++i)
-		{
-			if ((res >> i) & 1)
-			{
-				set_arr_bit(code, SIDE * 8 + SIDE - 1 - i);
-				set_arr_bit(code, SIDE * i + 8);
-			}
-			else
-			{
-				clr_arr_bit(code, SIDE * 8 + SIDE - 1 - i);
-				clr_arr_bit(code, SIDE * i + 8);
-			}
-		}
-
-		for (int i = 6; i < 8; ++i)
-		{
-			if ((res >> i) & 1)
-			{
-				set_arr_bit(code, SIDE * 8 + SIDE - 1 - i);
-				set_arr_bit(code, SIDE * (i + 1) + 8);
-			}
-			else
-			{
-				clr_arr_bit(code, SIDE * 8 + SIDE - 1 - i);
-				clr_arr_bit(code, SIDE * (i + 1) + 8);
-			}
-		}
-
-		if ((res >> 8) & 1)
-		{
-			set_arr_bit(code, SIDE * 8 + 7);
-			set_arr_bit(code, SIDE * (SIDE - 7) + 8);
-		}
-		else
-		{
-			clr_arr_bit(code, SIDE * 8 + 7);
-			clr_arr_bit(code, SIDE * (SIDE - 7) + 8);
-		}
-
-		for (int i = 9, j = 5; i < 15; ++i, --j)
-		{
-			if ((res >> i) & 1)
-			{
-				set_arr_bit(code, SIDE * 8 + j);
-				set_arr_bit(code, SIDE * (SIDE - 1 - j) + 8);
-			}
-			else
-			{
-				clr_arr_bit(code, SIDE * 8 + j);
-				clr_arr_bit(code, SIDE * (SIDE - 1 - j) + 8);
-			}
-		}
-	}
-
-	template <int V>
-	template <bool B>
-	void Qr<V>::draw_rect(int y, int x, int height, int width, uint8_t* out)
-	{
-		if (B)
-		{
-			for (int dy = y * SIDE; dy < (y + height) * SIDE; dy += SIDE)
-				for (int dx = x; dx < x + width; ++dx)
-					set_arr_bit(out, dy + dx);
-		}
-		else
-		{
-			for (int dy = y * SIDE; dy < (y + height) * SIDE; dy += SIDE)
-				for (int dx = x; dx < x + width; ++dx)
-					clr_arr_bit(out, dy + dx);
-		}
-	}
-
-	template <int V>
-	template <bool B>
-	void Qr<V>::draw_bound(int y, int x, int height, int width, uint8_t* out)
-	{
-		if (B)
-		{
-			for (int i = y * SIDE + x; i < y * SIDE + x + width; ++i)
-				set_arr_bit(out, i);
-			for (int i = (y + height - 1) * SIDE + x;
-				 i < (y + height - 1) * SIDE + x + width; ++i)
-				set_arr_bit(out, i);
-			for (int i = (y + 1) * SIDE + x; i < (y + height - 1) * SIDE + x; i += SIDE)
-				set_arr_bit(out, i);
-			for (int i = (y + 1) * SIDE + x + width - 1;
-				 i < (y + height - 1) * SIDE + x + width - 1; i += SIDE)
-				set_arr_bit(out, i);
-		}
-		else
-		{
-			for (int i = y * SIDE + x; i < y * SIDE + x + width; ++i)
-				clr_arr_bit(out, i);
-			for (int i = (y + height - 1) * SIDE + x;
-				 i < (y + height - 1) * SIDE + x + width; ++i)
-				clr_arr_bit(out, i);
-			for (int i = (y + 1) * SIDE + x; i < (y + height - 1) * SIDE + x; i += SIDE)
-				clr_arr_bit(out, i);
-			for (int i = (y + 1) * SIDE + x + width - 1;
-				 i < (y + height - 1) * SIDE + x + width - 1; i += SIDE)
-				clr_arr_bit(out, i);
-		}
-	}
-
-	template <int V>
-	void Qr<V>::reserve_patterns(uint8_t* out)
-	{
-		draw_rect<true>(0, 6, SIDE, 1, out);
-		draw_rect<true>(6, 0, 1, SIDE, out);
-
-		draw_rect<true>(0, 0, 9, 9, out);
-		draw_rect<true>(SIDE - 8, 0, 8, 9, out);
-		draw_rect<true>(0, SIDE - 8, 9, 8, out);
-
-		for (int i = 0; i < N_ALIGN; ++i)
-		{
-			for (int j = 0; j < N_ALIGN; ++j)
-			{
-				if ((!i && !j) || (!i && j == N_ALIGN - 1) || (!j && i == N_ALIGN - 1))
-					continue;
-				draw_rect<true>(ALIGN_POS[V][i] - 2, ALIGN_POS[V][j] - 2, 5, 5, out);
-			}
-		}
-
-		if (V >= 7)
-		{
-			draw_rect<true>(SIDE - 11, 0, 3, 6, out);
-			draw_rect<true>(0, SIDE - 11, 6, 3, out);
-		}
-	}
-
-	template <int V>
-	template <bool H>
-	int Qr<V>::rule_1_3_score()
-	{
-		constexpr int y_max	 = H ? N_BITS : SIDE;
-		constexpr int x_max	 = H ? SIDE : N_BITS;
-		constexpr int y_step = H ? SIDE : 1;
-		constexpr int x_step = H ? 1 : SIDE;
-
-		int res = 0;
-
-		for (int y = 0; y < y_max; y += y_step)
-		{
-			bool color	= get_arr_bit(code, y);
-			int	 finder = color;
-			int	 cnt	= 1;
-			for (int x = 1; x < x_max; x += x_step)
-			{
-				if (get_arr_bit(code, y + x) == color)
-				{
-					++cnt;
-					if (cnt == 5)
-						res += 3;
-					if (cnt > 5)
-						++res;
-				}
-				else
-				{
-					color = !color;
-					cnt	  = 1;
-				}
-				// Finder-like
-				finder = ((finder << 1) & 0x7ff) | color;
-				if (x >= x_step * 10)
-				{
-					if (finder == 0x05d || finder == 0x5d0)
-						res += 40;
-				}
-			}
-		}
-		return res;
-	}
-
-	template <int V>
-	int Qr<V>::penalty_score()
-	{
-		int res = 0;
-
-		res += rule_1_3_score<true>();
-		res += rule_1_3_score<false>();
-
-		for (int y = 0; y < N_BITS - SIDE; y += SIDE)
-		{
-			for (int x = 0; x < SIDE - 1; ++x)
-			{
-				bool c = get_arr_bit(code, y + x);
-
-				if (c == get_arr_bit(code, y + x + 1) &&
-					c == get_arr_bit(code, y + x + SIDE) &&
-					c == get_arr_bit(code, y + x + SIDE + 1))
-					res += 3;
-			}
-		}
-
-		int black = 0;
-		for (int y = 0; y < N_BITS; y += SIDE)
-		{
-			for (int x = 0; x < SIDE; ++x)
-				black += get_arr_bit(code, y + x);
-		}
-		res += abs((black * 100) / N_BITS - 50) / 5 * 10;
-
-		return res;
-	}
-
-	template <int V>
-	int Qr<V>::select_mask(Ecc ecc, uint8_t* patterns)
-	{
-		unsigned min_score = -1;
-		unsigned score	   = 0;
-		uint8_t	 mask	   = 0;
-
-		for (int i = 0; i < 8; ++i)
-		{
-			add_format(ecc, i);
-			apply_mask(i, patterns);
-			score = penalty_score();
-			if (score < min_score)
-			{
-				mask	  = i;
-				min_score = score;
-			}
-			apply_mask(i, patterns);
-		}
-		return mask;
-	}
-
-	template <int V>
-	void Qr<V>::apply_mask(int mask, uint8_t* patterns)
-	{
-		for (int y = 0, dy = 0; y < SIDE; ++y, dy += SIDE)
-		{
-			for (int x = 0; x < SIDE; ++x)
-			{
-				int coord = dy + x;
-
-				if (get_arr_bit(patterns, coord))
-					continue;
-
-				bool keep = true;
-
-				switch (mask)
-				{
-				case 0:
-					keep = (x + y) & 1;
-					break;
-				case 1:
-					keep = y & 1;
-					break;
-				case 2:
-					keep = x % 3;
-					break;
-				case 3:
-					keep = (x + y) % 3;
-					break;
-				case 4:
-					keep = (y / 2 + x / 3) & 1;
-					break;
-				case 5:
-					keep = x * y % 2 + x * y % 3;
-					break;
-				case 6:
-					keep = (x * y % 2 + x * y % 3) & 1;
-					break;
-				case 7:
-					keep = ((x + y) % 2 + x * y % 3) & 1;
-					break;
-				}
-
-				if (!keep)
-				{
-					if (get_arr_bit(code, coord))
-						clr_arr_bit(code, coord);
-					else
-						set_arr_bit(code, coord);
-				}
-			}
-		}
-	}
-
-	/// @brief QR code encoder class.
-	class QrDelegate final
-	{
-	public:
-		explicit QrDelegate() = default;
-		~QrDelegate()		  = default;
-
-		ZKA_COPY_DEFAULT(QrDelegate);
-
-		/// @brief Draw method delegate.
-		template <int V>
-		bool draw(Qr<V>& subject, int x, int y) noexcept
-		{
-			return subject.draw(x, y);
-		}
-	};
-} // namespace qr
-
-namespace Kernel::Qr
-{
-	using namespace qr;
-} // namespace Kernel::Qr
-
-#endif // QR_HXX
diff --git a/dev/ZBA/BootKit/Vendor/QrPrelude.hxx b/dev/ZBA/BootKit/Vendor/QrPrelude.hxx
deleted file mode 100644
index 31bd93da..00000000
--- a/dev/ZBA/BootKit/Vendor/QrPrelude.hxx
+++ /dev/null
@@ -1 +0,0 @@
-#include <BootKit/BitManip.hxx>
diff --git a/dev/ZBA/BootKit/Vendor/Shared/base.h b/dev/ZBA/BootKit/Vendor/Shared/base.h
deleted file mode 100644
index d1c028d7..00000000
--- a/dev/ZBA/BootKit/Vendor/Shared/base.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef UTL_BASE_H
-#define UTL_BASE_H
-
-#include <cstdint>
-#include <cstddef>
-#include <cassert>
-
-namespace utl
-{
-
-	/**
-	 * @brief Helper to get number of elements in array.
-	 *
-	 * @tparam T Auto-deduced element type
-	 * @tparam N Auto-deduced number of elements
-	 * @return Array size
-	 */
-	template <class T, size_t N>
-	constexpr size_t countof(T (&)[N])
-	{
-		return N;
-	}
-
-} // namespace utl
-
-#endif
\ No newline at end of file
diff --git a/dev/ZBA/BootKit/Vendor/Shared/bit.h b/dev/ZBA/BootKit/Vendor/Shared/bit.h
deleted file mode 100644
index 6923e94a..00000000
--- a/dev/ZBA/BootKit/Vendor/Shared/bit.h
+++ /dev/null
@@ -1,247 +0,0 @@
-#ifndef UTL_BIT_H
-#define UTL_BIT_H
-
-#include <bit>
-
-namespace utl
-{
-
-	/**
-	 * @brief Size of object in terms of bits.
-	 *
-	 * @tparam T Object type
-	 * @return Number of bits
-	 */
-	template <class T>
-	constexpr auto bit_size()
-	{
-		return sizeof(T) * 8;
-	}
-
-	/**
-	 * @brief Integer with all bits set to 1.
-	 *
-	 * @tparam T Integer type
-	 * @return All set integer
-	 */
-	template <class T>
-	constexpr T bit_full()
-	{
-		return T(-1);
-	}
-
-	/**
-	 * @brief Wrap around mask for power of two number of bits
-	 * within given integer type. For example:
-	 * [ bit_wrap<uint8_t>  = 8  - 1 = 0b111   ]
-	 * [ bit_wrap<uint16_t> = 16 - 1 = 0b1111  ]
-	 * [ bit_wrap<uint32_t> = 32 - 1 = 0b11111 ]
-	 *
-	 * @tparam T Integer type
-	 * @return Wrap around mask for number of bits
-	 */
-	template <class T>
-	constexpr T bit_wrap()
-	{
-		return bit_size<T>() - 1;
-	}
-
-	/**
-	 * @brief Number of bits to fit bit_wrap<T> result, in other words
-	 * bit width of (sizeof(T) * 8 - 1). For example:
-	 * [ bit_shft<uint8_t>  = bit_width(0b111)      = 3 ]
-	 * [ bit_shft<uint16_t> = bit_width(0b1111)     = 4 ]
-	 * [ bit_shft<uint32_t> = bit_width(0b11111)    = 5 ]
-	 *
-	 * @tparam T Integer type
-	 * @return Number of bits to shift to divide by sizeof(T) * 8
-	 */
-	template <class T>
-	constexpr auto bit_shft()
-	{
-		return std::bit_width(bit_wrap<T>());
-	}
-
-	/**
-	 * @brief Round up division by number of bits within given integer type,
-	 * which sizeof(T) * 8 is power of two.
-	 *
-	 * @tparam T Inetegr type
-	 * @param x Dividend
-	 * @return Quotient
-	 */
-	template <class T>
-	constexpr auto bit_ceil(auto x)
-	{
-		return (x + bit_wrap<T>()) >> bit_shft<T>();
-	}
-
-	/**
-	 * @brief Count leading zeros.
-	 *
-	 * @param x Unsigned integer argument
-	 * @return Number of leading zeros
-	 */
-	constexpr unsigned cntlz(auto x)
-	{
-		if constexpr (std::is_same_v<decltype(x), int>)
-			return std::countl_zero(unsigned(x));
-		else
-			return std::countl_zero(x);
-	}
-
-	/**
-	 * @brief Count trailing zeros.
-	 *
-	 * @param x Unsigned integer argument
-	 * @return Number of trailing zeros
-	 */
-	constexpr unsigned cnttz(auto x)
-	{
-		if constexpr (std::is_same_v<decltype(x), int>)
-			return std::countr_zero(unsigned(x));
-		else
-			return std::countr_zero(x);
-	}
-
-	/**
-	 * @brief Get number of words (integers) required to store N bits.
-	 *
-	 * @tparam T Word integer type
-	 * @param n Number of bits to store
-	 * @return Number of words
-	 */
-	template <class T>
-	constexpr size_t words_in_bits(size_t n)
-	{
-		return (n >> bit_shft<T>()) + !!(n & bit_wrap<T>());
-	}
-
-	/**
-	 * @brief Get number of bytes required to store N bits.
-	 *
-	 * @param n Number of bits to store
-	 * @return Number of bytes
-	 */
-	constexpr size_t bytes_in_bits(size_t n)
-	{
-		return words_in_bits<uint8_t>(n);
-	}
-
-	/**
-	 * @brief Make integer with bit at given position.
-	 *
-	 * @tparam T Inetegr type
-	 * @param n Bit position
-	 * @return Integer with set bit
-	 */
-	template <class T = unsigned>
-	constexpr T bit(int n)
-	{
-		return T(1) << n;
-	}
-
-	/**
-	 * @brief Get n-th bit of an integer.
-	 *
-	 * @tparam T Integer type
-	 * @param x Integer
-	 * @param n Bit position from LSB
-	 * @return true if set
-	 */
-	template <class T>
-	constexpr bool get_bit(T x, int n)
-	{
-		return (x >> n) & 1;
-	}
-
-	/**
-	 * @brief Set n-th bit of an integer.
-	 *
-	 * @tparam T Integer type
-	 * @param x Integer
-	 * @param n Bit position from LSB
-	 */
-	template <class T>
-	constexpr void set_bit(T& x, int n)
-	{
-		x |= 1 << n;
-	}
-
-	/**
-	 * @brief Clear n-th bit of an integer.
-	 *
-	 * @tparam T Integer type
-	 * @param x Integer
-	 * @param n Bit position from LSB
-	 */
-	template <class T>
-	constexpr void clr_bit(T& x, int n)
-	{
-		x &= ~(1 << n);
-	}
-
-	/**
-	 * @brief Get n-th bit in array of words (starting from LSB).
-	 *
-	 * @tparam T Word type
-	 * @param p Array of words
-	 * @param n Index of bit to get
-	 * @return true if set
-	 */
-	template <class T>
-	constexpr bool get_arr_bit(const T* p, unsigned n)
-	{
-		return get_bit(p[n >> bit_shft<T>()], n & bit_wrap<T>());
-	}
-
-	/**
-	 * @brief Set n-th bit in array of words (starting from LSB).
-	 *
-	 * @tparam T Word type
-	 * @param p Array of words
-	 * @param n Index of bit to set
-	 */
-	template <class T>
-	constexpr void set_arr_bit(T* p, unsigned n)
-	{
-		set_bit(p[n >> bit_shft<T>()], n & bit_wrap<T>());
-	}
-
-	/**
-	 * @brief Clear n-th bit in array of words (starting from LSB).
-	 *
-	 * @tparam T Word type
-	 * @param p Array of words
-	 * @param n Index of bit to clear
-	 */
-	template <class T>
-	constexpr void clr_arr_bit(T* p, unsigned n)
-	{
-		clr_bit(p[n >> bit_shft<T>()], n & bit_wrap<T>());
-	}
-
-	/**
-	 * @brief Shift bits left in array of integer elements from least significant bit
-	 * and considering 0-th byte as the right most.
-	 * uint16_t example: 0b10000000'11100001 ==> 0b00000001'11000010.
-	 *
-	 * @tparam T Integer type
-	 * @tparam L Length of array
-	 * @param x Array of integers, nullptr not acceptable!
-	 * @param len Number of elements
-	 */
-	template <class T, size_t L>
-	constexpr void shift_left(T (&x)[L])
-	{
-		for (int i = L - 1; i > 0; --i)
-		{
-			x[i] <<= 1;
-			x[i] |= x[i - 1] >> bit_wrap<T>();
-		}
-		x[0] <<= 1;
-	}
-
-} // namespace utl
-
-#endif
diff --git a/dev/ZBA/BootKit/compile_flags.txt b/dev/ZBA/BootKit/compile_flags.txt
deleted file mode 100644
index 337bf99b..00000000
--- a/dev/ZBA/BootKit/compile_flags.txt
+++ /dev/null
@@ -1,3 +0,0 @@
--std=c++20
--I../
--I../../Kernel
diff --git a/dev/ZBA/Modules/NetBoot/Module.cxx b/dev/ZBA/Modules/NetBoot/Module.cxx
index ea30569b..294f9267 100644
--- a/dev/ZBA/Modules/NetBoot/Module.cxx
+++ b/dev/ZBA/Modules/NetBoot/Module.cxx
@@ -10,7 +10,7 @@
 #include <NetBoot.hxx>
 #include <BootKit/BootKit.hxx>
 
-EXTERN_C Int32 main(Kernel::HEL::HandoverInformationHeader* Handover)
+EXTERN_C Int32 main(Kernel::HEL::HANDOVER_INFO_HEADER* Handover)
 {
 	return kEfiOk;
 }
diff --git a/dev/ZBA/Modules/NetBoot/compile_flags.txt b/dev/ZBA/Modules/NetBoot/compile_flags.txt
deleted file mode 100644
index 6ab76da0..00000000
--- a/dev/ZBA/Modules/NetBoot/compile_flags.txt
+++ /dev/null
@@ -1,8 +0,0 @@
--std=c++20
--I../
--I../../
--I../../Kernel
--D__ZKA_AMD64__
--std=c++20
--D__x86_64__
--D__ZKA_OTA__
diff --git a/dev/ZBA/Modules/SysChk/Module.cxx b/dev/ZBA/Modules/SysChk/Module.cxx
index 7bf7fb62..0fe6bc9a 100644
--- a/dev/ZBA/Modules/SysChk/Module.cxx
+++ b/dev/ZBA/Modules/SysChk/Module.cxx
@@ -9,10 +9,10 @@
 
 #include <BootKit/BootKit.hxx>
 
-EXTERN_C Int32 ModuleMain(Kernel::HEL::HandoverInformationHeader* Handover)
+EXTERN_C Int32 ModuleMain(Kernel::HEL::HANDOVER_INFO_HEADER* Handover)
 {
 	EfiSystemTable* cST = (EfiSystemTable*)Handover->f_FirmwareCustomTables[1];
-	
+
 	cST->ConOut->ClearScreen(cST->ConOut);
 
 	cST->ConOut->OutputString(cST->ConOut, L"SYSCHK: CHECKING FOR VALID NEWFS OR HPFS PARTITIONS...\r\n");
diff --git a/dev/ZBA/Modules/SysChk/compile_flags.txt b/dev/ZBA/Modules/SysChk/compile_flags.txt
deleted file mode 100644
index 6ab76da0..00000000
--- a/dev/ZBA/Modules/SysChk/compile_flags.txt
+++ /dev/null
@@ -1,8 +0,0 @@
--std=c++20
--I../
--I../../
--I../../Kernel
--D__ZKA_AMD64__
--std=c++20
--D__x86_64__
--D__ZKA_OTA__
diff --git a/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx b/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx
index ad454ab4..07fd0595 100644
--- a/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx
+++ b/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx
@@ -97,8 +97,8 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr	  ImageHandle,
 	UInt32				 SzDesc		= sizeof(EfiMemoryDescriptor);
 	UInt32				 RevDesc	= 0;
 
-	HEL::HandoverInformationHeader* handoverHdrPtr =
-		new HEL::HandoverInformationHeader();
+	HEL::HANDOVER_INFO_HEADER* handover_hdr =
+		new HEL::HANDOVER_INFO_HEADER();
 
 	for (SizeT indexVT = 0; indexVT < SystemTable->NumberOfTableEntries;
 		 ++indexVT)
@@ -112,7 +112,7 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr	  ImageHandle,
 			vendorTable[4] == 'P' && vendorTable[5] == 'T' &&
 			vendorTable[6] == 'R' && vendorTable[7] == ' ')
 		{
-			handoverHdrPtr->f_HardwareTables.f_VendorPtr = (VoidPtr)vendorTable;
+			handover_hdr->f_HardwareTables.f_VendorPtr = (VoidPtr)vendorTable;
 			break;
 		}
 	}
@@ -121,12 +121,12 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr	  ImageHandle,
 	// draw background color.
 	// ------------------------------------------ //
 
-	handoverHdrPtr->f_GOP.f_The			 = kGop->Mode->FrameBufferBase;
-	handoverHdrPtr->f_GOP.f_Width		 = kGop->Mode->Info->VerticalResolution;
-	handoverHdrPtr->f_GOP.f_Height		 = kGop->Mode->Info->HorizontalResolution;
-	handoverHdrPtr->f_GOP.f_PixelPerLine = kGop->Mode->Info->PixelsPerScanLine;
-	handoverHdrPtr->f_GOP.f_PixelFormat	 = kGop->Mode->Info->PixelFormat;
-	handoverHdrPtr->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.	   //
@@ -139,12 +139,12 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr	  ImageHandle,
 
 	BS->LocateProtocol(&guid_mp, nullptr, reinterpret_cast<VoidPtr*>(&mp));
 
-	handoverHdrPtr->f_HardwareTables.f_MpPtr = reinterpret_cast<VoidPtr>(mp);
+	handover_hdr->f_HardwareTables.f_MpPtr = reinterpret_cast<VoidPtr>(mp);
 
-	kHandoverHeader = handoverHdrPtr;
+	kHandoverHeader = handover_hdr;
 
 	CGInit();
-	CGDrawInRegion(CGColor(0xFF, 0x3A, 0x3A), handoverHdrPtr->f_GOP.f_Height, handoverHdrPtr->f_GOP.f_Width, 0, 0);
+	CGDrawInRegion(CGColor(0xFF, 0x3A, 0x3A), handover_hdr->f_GOP.f_Height, handover_hdr->f_GOP.f_Width, 0, 0);
 	CGFini();
 
 	UInt32 cnt_enabled	= 0;
@@ -155,7 +155,7 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr	  ImageHandle,
 	CGDrawString("NEWOSLDR (C) ZKA TECHNOLOGIES.", 10, 10, RGB(0xFF, 0xFF, 0xFF));
 	CGDrawString((cnt_enabled > 1) ? "MULTIPLE PROCESSORS DETECTED." : "SINGLE PROCESSOR DETECTED.", 20, 10, RGB(0xFF, 0xFF, 0xFF));
 
-	handoverHdrPtr->f_HardwareTables.f_MultiProcessingEnabled = cnt_enabled > 1;
+	handover_hdr->f_HardwareTables.f_MultiProcessingEnabled = cnt_enabled > 1;
 	// Fill handover header now.
 
 	BDiskFormatFactory<BootDeviceATA> checkPart;
@@ -203,22 +203,22 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr	  ImageHandle,
 	// Update handover file specific table and phyiscal start field.
 	//-----------------------------------------------------------//
 
-	handoverHdrPtr->f_PageStart =
+	handover_hdr->f_PageStart =
 		(VoidPtr)Descriptor[cDefaultMemoryMap].PhysicalStart;
 
-	handoverHdrPtr->f_FirmwareSpecific[HEL::kHandoverSpecificAttrib] =
+	handover_hdr->f_FirmwareSpecific[HEL::kHandoverSpecificAttrib] =
 		Descriptor[cDefaultMemoryMap].Attribute;
-	handoverHdrPtr->f_FirmwareSpecific[HEL::kHandoverSpecificKind] =
+	handover_hdr->f_FirmwareSpecific[HEL::kHandoverSpecificKind] =
 		Descriptor[cDefaultMemoryMap].Kind;
-	handoverHdrPtr->f_FirmwareSpecific[HEL::kHandoverSpecificMemoryEfi] =
+	handover_hdr->f_FirmwareSpecific[HEL::kHandoverSpecificMemoryEfi] =
 		(UIntPtr)Descriptor;
 
-	handoverHdrPtr->f_BitMapStart = (VoidPtr)Descriptor[cDefaultMemoryMap].VirtualStart;
+	handover_hdr->f_BitMapStart = (VoidPtr)Descriptor[cDefaultMemoryMap].VirtualStart;
 
-	handoverHdrPtr->f_BitMapSize = kHandoverBitMapSz; /* # of pages */
+	handover_hdr->f_BitMapSize = kHandoverBitMapSz; /* # of pages */
 
-	handoverHdrPtr->f_FirmwareCustomTables[0] = (VoidPtr)BS;
-	handoverHdrPtr->f_FirmwareCustomTables[1] = (VoidPtr)ST;
+	handover_hdr->f_FirmwareCustomTables[0] = (VoidPtr)BS;
+	handover_hdr->f_FirmwareCustomTables[1] = (VoidPtr)ST;
 
 	BFileReader readerSysChk(L"syschk.sys", ImageHandle);
 	readerSysChk.ReadAll(0);
@@ -235,24 +235,24 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr	  ImageHandle,
 		loaderSysChk->SetName("System Check SYS.");
 	}
 
-	loaderSysChk->Start(handoverHdrPtr);
+	loaderSysChk->Start(handover_hdr);
 
 	// nullify these fields, to avoid being reused later.
 
-	handoverHdrPtr->f_FirmwareCustomTables[0] = nullptr;
-	handoverHdrPtr->f_FirmwareCustomTables[1] = nullptr;
+	handover_hdr->f_FirmwareCustomTables[0] = nullptr;
+	handover_hdr->f_FirmwareCustomTables[1] = nullptr;
 
-	handoverHdrPtr->f_FirmwareVendorLen = BStrLen(SystemTable->FirmwareVendor);
+	handover_hdr->f_FirmwareVendorLen = BStrLen(SystemTable->FirmwareVendor);
 
-	handoverHdrPtr->f_Magic	  = kHandoverMagic;
-	handoverHdrPtr->f_Version = kHandoverVersion;
+	handover_hdr->f_Magic	  = kHandoverMagic;
+	handover_hdr->f_Version = kHandoverVersion;
 
 	// Provide fimware vendor name.
 
-	BCopyMem(handoverHdrPtr->f_FirmwareVendorName, SystemTable->FirmwareVendor,
-			 handoverHdrPtr->f_FirmwareVendorLen);
+	BCopyMem(handover_hdr->f_FirmwareVendorName, SystemTable->FirmwareVendor,
+			 handover_hdr->f_FirmwareVendorLen);
 
-	handoverHdrPtr->f_FirmwareVendorLen = BStrLen(SystemTable->FirmwareVendor);
+	handover_hdr->f_FirmwareVendorLen = BStrLen(SystemTable->FirmwareVendor);
 
 	// Assign to global 'kHandoverHeader'.
 
@@ -271,7 +271,7 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr	  ImageHandle,
 		loader = new Boot::BThread(readerKernel.Blob());
 		loader->SetName("64-Bit Kernel EXE.");
 
-		handoverHdrPtr->f_KernelImage = readerKernel.Blob();
+		handover_hdr->f_KernelImage = readerKernel.Blob();
 	}
 	else
 	{
@@ -290,14 +290,14 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr	  ImageHandle,
 		chimeWav.Blob() &&
 		urbanistTTF.Blob())
 	{
-		handoverHdrPtr->f_StartupChime	 = chimeWav.Blob();
-		handoverHdrPtr->f_ChimeSz		 = chimeWav.Size();
-		handoverHdrPtr->f_StartupImage	 = readerSysDrv.Blob();
-		handoverHdrPtr->f_StartupSz		 = readerSysDrv.Size();
-		handoverHdrPtr->f_KernelImage	 = readerKernel.Blob();
-		handoverHdrPtr->f_KernelSz		 = readerKernel.Size();
-		handoverHdrPtr->f_TTFallbackFont = urbanistTTF.Blob();
-		handoverHdrPtr->f_FontSz		 = urbanistTTF.Size();
+		handover_hdr->f_StartupChime	 = chimeWav.Blob();
+		handover_hdr->f_ChimeSz		 = chimeWav.Size();
+		handover_hdr->f_StartupImage	 = readerSysDrv.Blob();
+		handover_hdr->f_StartupSz		 = readerSysDrv.Size();
+		handover_hdr->f_KernelImage	 = readerKernel.Blob();
+		handover_hdr->f_KernelSz		 = readerKernel.Size();
+		handover_hdr->f_TTFallbackFont = urbanistTTF.Blob();
+		handover_hdr->f_FontSz		 = urbanistTTF.Size();
 	}
 	else
 	{
@@ -310,7 +310,7 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr	  ImageHandle,
 	// Finally load Kernel, and the cr3 to it.
 	// ---------------------------------------------------- //
 
-	loader->Start(handoverHdrPtr);
+	loader->Start(handover_hdr);
 
 	EFI::Stop();
 
diff --git a/dev/ZBA/Sources/HEL/AMD64/compile_flags.txt b/dev/ZBA/Sources/HEL/AMD64/compile_flags.txt
deleted file mode 100644
index 5b5d895a..00000000
--- a/dev/ZBA/Sources/HEL/AMD64/compile_flags.txt
+++ /dev/null
@@ -1,7 +0,0 @@
--std=c++20
--I../../../
--I../../../../Kernel
--D__ZKA_AMD64__
--std=c++20
--D__x86_64__
--D__ZKA_OTA__
diff --git a/dev/ZBA/Sources/Thread.cxx b/dev/ZBA/Sources/Thread.cxx
index 8bcecc2c..c811e620 100644
--- a/dev/ZBA/Sources/Thread.cxx
+++ b/dev/ZBA/Sources/Thread.cxx
@@ -15,12 +15,13 @@
 #include <CFKit/LoaderUtils.hxx>
 #include <Modules/CoreCG/TextRenderer.hxx>
 
-EXTERN_C{
+EXTERN_C
+{
 #include <string.h>
-}
 
-EXTERN_C Void
-rt_jump_to_address(VoidPtr start, VoidPtr handover);
+	Void
+	rt_jump_to_address(VoidPtr start, VoidPtr handover);
+}
 
 // External boot services symbol.
 EXTERN EfiBootServices* BS;
@@ -140,7 +141,7 @@ namespace Boot
 	}
 
 	/// @note handover header has to be valid!
-	Void BThread::Start(HEL::HandoverInformationHeader* handover)
+	Void BThread::Start(HEL::HANDOVER_INFO_HEADER* handover)
 	{
 		BTextWriter writer;
 
@@ -150,7 +151,7 @@ namespace Boot
 			return;
 		}
 
-		HEL::HandoverProc err_fn = [](HEL::HandoverInformationHeader* rcx) -> void {
+		HEL::HandoverProc err_fn = [](HEL::HANDOVER_INFO_HEADER* rcx) -> void {
 			CGDrawString("NEWOSLDR: INVALID IMAGE! ABORTING...", 50, 10, RGB(0xFF, 0xFF, 0xFF));
 			EFI::Stop();
 		};
diff --git a/dev/ZBA/Sources/compile_flags.txt b/dev/ZBA/Sources/compile_flags.txt
deleted file mode 100644
index 6ab76da0..00000000
--- a/dev/ZBA/Sources/compile_flags.txt
+++ /dev/null
@@ -1,8 +0,0 @@
--std=c++20
--I../
--I../../
--I../../Kernel
--D__ZKA_AMD64__
--std=c++20
--D__x86_64__
--D__ZKA_OTA__
diff --git a/dev/ZKA/ArchKit/compile_flags.txt b/dev/ZKA/ArchKit/compile_flags.txt
deleted file mode 100644
index 0fa2cfc6..00000000
--- a/dev/ZKA/ArchKit/compile_flags.txt
+++ /dev/null
@@ -1,8 +0,0 @@
--nostdlib
--ffreestanding
--std=c++20
--I./
--I../
--I$(HOME)/
--D__ZKA_AMD64__
--D__ED__
diff --git a/dev/ZKA/CFKit/compile_flags.txt b/dev/ZKA/CFKit/compile_flags.txt
deleted file mode 100644
index a37ae6bf..00000000
--- a/dev/ZKA/CFKit/compile_flags.txt
+++ /dev/null
@@ -1,5 +0,0 @@
--nostdlib
--ffreestanding
--std=c++20
--I./
--I../
diff --git a/dev/ZKA/FirmwareKit/EFI/API.hxx b/dev/ZKA/FirmwareKit/EFI/API.hxx
index c5c9de4c..6245e0e4 100644
--- a/dev/ZKA/FirmwareKit/EFI/API.hxx
+++ b/dev/ZKA/FirmwareKit/EFI/API.hxx
@@ -21,8 +21,6 @@ class BTextWriter;
 #define __BOOTKIT_NO_INCLUDE__ 1
 
 #include <BootKit/BootKit.hxx>
-#include <BootKit/Rsrc/NewBootFatal.rsrc>
-#include <BootKit/Vendor/Qr.hxx>
 #include <Modules/CoreCG/FbRenderer.hxx>
 #endif // ifdef __NEWOSLDR__
 
diff --git a/dev/ZKA/FirmwareKit/Handover.hxx b/dev/ZKA/FirmwareKit/Handover.hxx
index c398bd50..3332c463 100644
--- a/dev/ZKA/FirmwareKit/Handover.hxx
+++ b/dev/ZKA/FirmwareKit/Handover.hxx
@@ -8,7 +8,7 @@
  * @file Handover.hxx
  * @author Amlal El Mahrouss (amlalelmahrouss@icloud.com)
  * @brief The handover boot protocol.
- * @version 0.3
+ * @version 1.15
  * @date 2024-02-23
  *
  * @copyright Copyright (c) 2024, ZKA Technologies
@@ -19,20 +19,20 @@
 
 #include <NewKit/Defines.hxx>
 
-/* useful macros */
+/* Handover macros. */
 
 #define kHandoverMagic	 0xBADCC
-#define kHandoverVersion 0x0115
+#define kHandoverVersion 0x0116
 
-/* per page. */
-#define kHandoverBitMapSz gib_cast(32)
-#define kHandoverStructSz sizeof(HEL::HandoverInformationHeader)
+/* Initial bitmap size. */
+#define kHandoverBitMapSz gib_cast(64)
+#define kHandoverStructSz sizeof(HEL::HANDOVER_INFO_HEADER)
 
 namespace Kernel::HEL
 {
 	/**
-	@brief the kind of executable we're loading.
-*/
+	@brief The executable type enum.
+	*/
 	enum
 	{
 		kTypeKernel		  = 100,
@@ -43,16 +43,18 @@ namespace Kernel::HEL
 	};
 
 	/**
-	@brief The executable architecture.
-*/
+	@brief The executable architecture enum.
+	*/
 
 	enum
 	{
-		kArchAmd64 = 122,
-		kArchCount = 2,
+		kArchAMD64 = 122,
+		kArchARM64 = 123,
+		kArchRISCV = 124,
+		kArchCount = 3,
 	};
 
-	struct HandoverInformationHeader
+	struct HANDOVER_INFO_HEADER final
 	{
 		UInt64 f_Magic;
 		UInt64 f_Version;
@@ -105,11 +107,11 @@ namespace Kernel::HEL
 	};
 
 	/// @brief Bootloader main type.
-	typedef void (*BootMainKind)(HandoverInformationHeader* handoverInfo);
+	typedef void (*BootMainKind)(HANDOVER_INFO_HEADER* handoverInfo);
 
 	/// @brief Alias of bootloader main type.
-	typedef void (*HandoverProc)(HandoverInformationHeader* handoverInfo);
+	typedef void (*HandoverProc)(HANDOVER_INFO_HEADER* handoverInfo);
 } // namespace Kernel::HEL
 
 /// @brief Bootloader global header.
-inline Kernel::HEL::HandoverInformationHeader* kHandoverHeader = nullptr;
+inline Kernel::HEL::HANDOVER_INFO_HEADER* kHandoverHeader = nullptr;
diff --git a/dev/ZKA/HALKit/AMD64/HalBMPMgr.cxx b/dev/ZKA/HALKit/AMD64/HalBMPMgr.cxx
index 71c8cb61..57565b5b 100644
--- a/dev/ZKA/HALKit/AMD64/HalBMPMgr.cxx
+++ b/dev/ZKA/HALKit/AMD64/HalBMPMgr.cxx
@@ -23,8 +23,35 @@ namespace Kernel
 	{
 		namespace Detail
 		{
-			struct AllocatorTraits final
+			struct IBitMapAllocator final
 			{
+				Bool FreeBitMap(VoidPtr page_ptr)
+				{
+				    if (!page_ptr) return No;
+
+					UIntPtr* ptr_bit_set = reinterpret_cast<UIntPtr*>(page_ptr);
+
+					if (!ptr_bit_set[0] ||
+						ptr_bit_set[0] != cBitMpMagic)
+						return No;
+
+					kcout << "BMPMgr: Freed Range!\r";
+					kcout << "Magic Number: " << hex_number(ptr_bit_set[0]) << endl;
+					kcout << "Size of pointer (B): " << number(ptr_bit_set[1]) << endl;
+					kcout << "Size of pointer (KIB): " << number(KIB(ptr_bit_set[1])) << endl;
+					kcout << "Size of pointer (MIB): " << number(MIB(ptr_bit_set[1])) << endl;
+					kcout << "Size of pointer (GIB): " << number(GIB(ptr_bit_set[1])) << endl;
+					kcout << "Size of pointer (TIB): " << number(TIB(ptr_bit_set[1])) << endl;
+					kcout << "Address Of Header: " << hex_number((UIntPtr)ptr_bit_set) << endl;
+
+					ptr_bit_set[0] = cBitMpMagic;
+					ptr_bit_set[2] = No;
+
+					mm_map_page(page_ptr, ~eFlagsPresent);
+
+					return Yes;
+				}
+
 				/// @brief Iterate over availables pages for a free one.
 				/// @return The new address which was found.
 				VoidPtr FindBitMap(VoidPtr base_ptr, SizeT size, Bool rw, Bool user) noexcept
@@ -35,8 +62,6 @@ namespace Kernel
 					{
 						UIntPtr* ptr_bit_set = reinterpret_cast<UIntPtr*>(base_ptr);
 
-						mm_map_page(ptr_bit_set, eFlagsPresent | eFlagsRw);
-
 						if (ptr_bit_set[0] == cBitMpMagic)
 						{
 							if (ptr_bit_set[1] != 0 &&
@@ -97,9 +122,6 @@ namespace Kernel
 						}
 
 						base_ptr = reinterpret_cast<VoidPtr>(reinterpret_cast<UIntPtr>(base_ptr) + (ptr_bit_set[0] != cBitMpMagic ? size : ptr_bit_set[1]));
-
-						if (reinterpret_cast<UIntPtr>(base_ptr) >= (kHandoverHeader->f_BitMapSize + base))
-							ke_stop(RUNTIME_CHECK_VIRTUAL_OUT_OF_MEM);
 					}
 
 					return nullptr;
@@ -113,8 +135,8 @@ namespace Kernel
 		/// @return
 		auto mm_alloc_bitmap(Boolean rw, Boolean user, SizeT size) -> VoidPtr
 		{
-			VoidPtr					ptr_new = nullptr;
-			Detail::AllocatorTraits traits;
+			VoidPtr					 ptr_new = nullptr;
+			Detail::IBitMapAllocator traits;
 
 			ptr_new = traits.FindBitMap(kKernelVirtualStart, size, rw, user);
 
@@ -124,29 +146,10 @@ namespace Kernel
 		auto mm_free_bitmap(VoidPtr page_ptr) -> Bool
 		{
 			if (!page_ptr)
-				return false;
-
-			UIntPtr* ptr_bit_set = reinterpret_cast<UIntPtr*>(page_ptr);
-
-			if (!ptr_bit_set[0] ||
-				ptr_bit_set[0] != cBitMpMagic)
-				return false;
-
-			kcout << "BMPMgr: Freed Range!\r";
-			kcout << "Magic Number: " << hex_number(ptr_bit_set[0]) << endl;
-			kcout << "Size of pointer (B): " << number(ptr_bit_set[1]) << endl;
-			kcout << "Size of pointer (KIB): " << number(KIB(ptr_bit_set[1])) << endl;
-			kcout << "Size of pointer (MIB): " << number(MIB(ptr_bit_set[1])) << endl;
-			kcout << "Size of pointer (GIB): " << number(GIB(ptr_bit_set[1])) << endl;
-			kcout << "Size of pointer (TIB): " << number(TIB(ptr_bit_set[1])) << endl;
-			kcout << "Address Of Header: " << hex_number((UIntPtr)ptr_bit_set) << endl;
-
-			ptr_bit_set[0] = cBitMpMagic;
-			ptr_bit_set[2] = No;
-
-			mm_map_page(page_ptr, ~eFlagsPresent);
+				return No;
 
-			return true;
+			Detail::IBitMapAllocator traits;
+			return traits.FreeBitMap(page_ptr);
 		}
 	} // namespace HAL
 } // namespace Kernel
diff --git a/dev/ZKA/HALKit/AMD64/HalKernelMain.cxx b/dev/ZKA/HALKit/AMD64/HalKernelMain.cxx
index 4f9e8bac..9b9e0ac1 100644
--- a/dev/ZKA/HALKit/AMD64/HalKernelMain.cxx
+++ b/dev/ZKA/HALKit/AMD64/HalKernelMain.cxx
@@ -63,7 +63,7 @@ EXTERN_C Kernel::Void ke_dll_entrypoint(Kernel::Void);
 
 /// @brief Kernel init procedure.
 EXTERN_C void hal_init_platform(
-	Kernel::HEL::HandoverInformationHeader* HandoverHeader)
+	Kernel::HEL::HANDOVER_INFO_HEADER* HandoverHeader)
 {
 	kHandoverHeader = HandoverHeader;
 
diff --git a/dev/ZKA/HALKit/ARM64/HalKernelMain.cxx b/dev/ZKA/HALKit/ARM64/HalKernelMain.cxx
index c617c45d..1bfaa879 100644
--- a/dev/ZKA/HALKit/ARM64/HalKernelMain.cxx
+++ b/dev/ZKA/HALKit/ARM64/HalKernelMain.cxx
@@ -56,7 +56,7 @@ Kernel::Void hal_real_init(Kernel::Void) noexcept;
 EXTERN_C Kernel::Void ke_dll_entrypoint(Kernel::Void);
 
 EXTERN_C void hal_init_platform(
-	Kernel::HEL::HandoverInformationHeader* HandoverHeader)
+	Kernel::HEL::HANDOVER_INFO_HEADER* HandoverHeader)
 {
 	/* Setup globals. */
 
diff --git a/dev/ZKA/HALKit/compile_flags.txt b/dev/ZKA/HALKit/compile_flags.txt
deleted file mode 100644
index d6e35511..00000000
--- a/dev/ZKA/HALKit/compile_flags.txt
+++ /dev/null
@@ -1,6 +0,0 @@
--nostdlib
--ffreestanding
--std=c++20
--I./
--I../
--D__ZKA_AMD64__
diff --git a/dev/ZKA/KernelKit/ThreadLocalStorage.hxx b/dev/ZKA/KernelKit/ThreadLocalStorage.hxx
index ee272be3..a25d8926 100644
--- a/dev/ZKA/KernelKit/ThreadLocalStorage.hxx
+++ b/dev/ZKA/KernelKit/ThreadLocalStorage.hxx
@@ -32,11 +32,11 @@ Kernel::Boolean tls_check_tib(THREAD_INFORMATION_BLOCK* the_tib);
 
 ///! @brief new ptr syscall.
 template <typename T>
-T* tls_new_ptr(void);
+T* tls_new_ptr(void) noexcept;
 
 ///! @brief delete ptr syscall.
 template <typename T>
-Kernel::Boolean tls_delete_ptr(T* ptr);
+Kernel::Boolean tls_delete_ptr(T* ptr) noexcept;
 
 template <typename T, typename... Args>
 T* tls_new_class(Args&&... args);
diff --git a/dev/ZKA/KernelKit/compile_flags.txt b/dev/ZKA/KernelKit/compile_flags.txt
deleted file mode 100644
index 39b236a9..00000000
--- a/dev/ZKA/KernelKit/compile_flags.txt
+++ /dev/null
@@ -1,6 +0,0 @@
--nostdlib
--ffreestanding
--std=c++20
--I./
--I../
--D__ED__
diff --git a/dev/ZKA/Modules/ACPI/compile_flags.txt b/dev/ZKA/Modules/ACPI/compile_flags.txt
deleted file mode 100644
index 1bc51142..00000000
--- a/dev/ZKA/Modules/ACPI/compile_flags.txt
+++ /dev/null
@@ -1,4 +0,0 @@
--I./
--I../
--I../../
--std=c++20
diff --git a/dev/ZKA/Modules/AHCI/compile_flags.txt b/dev/ZKA/Modules/AHCI/compile_flags.txt
deleted file mode 100644
index 1bc51142..00000000
--- a/dev/ZKA/Modules/AHCI/compile_flags.txt
+++ /dev/null
@@ -1,4 +0,0 @@
--I./
--I../
--I../../
--std=c++20
diff --git a/dev/ZKA/Modules/ATA/compile_flags.txt b/dev/ZKA/Modules/ATA/compile_flags.txt
deleted file mode 100644
index 1bc51142..00000000
--- a/dev/ZKA/Modules/ATA/compile_flags.txt
+++ /dev/null
@@ -1,4 +0,0 @@
--I./
--I../
--I../../
--std=c++20
diff --git a/dev/ZKA/Modules/IEEE802/compile_flags.txt b/dev/ZKA/Modules/IEEE802/compile_flags.txt
deleted file mode 100644
index 1fbcad21..00000000
--- a/dev/ZKA/Modules/IEEE802/compile_flags.txt
+++ /dev/null
@@ -1,4 +0,0 @@
--I./
--I../
--I../Kernel
--std=c++20
diff --git a/dev/ZKA/Modules/MBCI/compile_flags.txt b/dev/ZKA/Modules/MBCI/compile_flags.txt
deleted file mode 100644
index df83bf4c..00000000
--- a/dev/ZKA/Modules/MBCI/compile_flags.txt
+++ /dev/null
@@ -1,4 +0,0 @@
--I./
--I../../
--I../../Kernel
--std=c++20
diff --git a/dev/ZKA/Modules/NVME/compile_flags.txt b/dev/ZKA/Modules/NVME/compile_flags.txt
deleted file mode 100644
index 1bc51142..00000000
--- a/dev/ZKA/Modules/NVME/compile_flags.txt
+++ /dev/null
@@ -1,4 +0,0 @@
--I./
--I../
--I../../
--std=c++20
diff --git a/dev/ZKA/Modules/WiFi/compile_flags.txt b/dev/ZKA/Modules/WiFi/compile_flags.txt
deleted file mode 100644
index 1bc51142..00000000
--- a/dev/ZKA/Modules/WiFi/compile_flags.txt
+++ /dev/null
@@ -1,4 +0,0 @@
--I./
--I../
--I../../
--std=c++20
diff --git a/dev/ZKA/Modules/XHCI/compile_flags.txt b/dev/ZKA/Modules/XHCI/compile_flags.txt
deleted file mode 100644
index 1bc51142..00000000
--- a/dev/ZKA/Modules/XHCI/compile_flags.txt
+++ /dev/null
@@ -1,4 +0,0 @@
--I./
--I../
--I../../
--std=c++20
diff --git a/dev/ZKA/NetworkKit/compile_flags.txt b/dev/ZKA/NetworkKit/compile_flags.txt
deleted file mode 100644
index 39b236a9..00000000
--- a/dev/ZKA/NetworkKit/compile_flags.txt
+++ /dev/null
@@ -1,6 +0,0 @@
--nostdlib
--ffreestanding
--std=c++20
--I./
--I../
--D__ED__
diff --git a/dev/ZKA/NewKit/compile_flags.txt b/dev/ZKA/NewKit/compile_flags.txt
deleted file mode 100644
index 14c5bc51..00000000
--- a/dev/ZKA/NewKit/compile_flags.txt
+++ /dev/null
@@ -1,6 +0,0 @@
--nostdlib
--ffreestanding
--std=c++20
--I./
--I../
--I../../../
diff --git a/dev/ZKA/Sources/FS/compile_flags.txt b/dev/ZKA/Sources/FS/compile_flags.txt
deleted file mode 100644
index 39b236a9..00000000
--- a/dev/ZKA/Sources/FS/compile_flags.txt
+++ /dev/null
@@ -1,6 +0,0 @@
--nostdlib
--ffreestanding
--std=c++20
--I./
--I../
--D__ED__
diff --git a/dev/ZKA/Sources/compile_flags.txt b/dev/ZKA/Sources/compile_flags.txt
deleted file mode 100644
index a22ed881..00000000
--- a/dev/ZKA/Sources/compile_flags.txt
+++ /dev/null
@@ -1,7 +0,0 @@
--nostdlib
--ffreestanding
--std=c++20
--I../
--I$(HOME)/
--D__FSKIT_USE_NEFS__
--D__ZKA_AMD64__
diff --git a/dev/ZKA/compile_flags.txt b/dev/ZKA/compile_flags.txt
deleted file mode 100644
index 290eeee3..00000000
--- a/dev/ZKA/compile_flags.txt
+++ /dev/null
@@ -1,9 +0,0 @@
--nostdlib
--ffreestanding
--std=c++20
--I./
--I$(HOME)/
--D__ZKA_AMD64__
--I../Vendor
--D__x86_64__
--D__ED__