IMPL: Important refactors and improvements of ZkaOS.

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>

30 files changed, 115 insertions, 53 deletions

diff --git a/dev/Kernel/FirmwareKit/EFI/API.h b/dev/Kernel/FirmwareKit/EFI/API.h
index 7bb83ebf..218ca85a 100644
--- a/dev/Kernel/FirmwareKit/EFI/API.h
+++ b/dev/Kernel/FirmwareKit/EFI/API.h
@@ -21,7 +21,7 @@ class BTextWriter;
 #define __BOOTKIT_NO_INCLUDE__ 1
 
 #include <BootKit/BootKit.h>
-#include <Modules/FB/FB.h>
+#include <Modules/GfxMgr/FBMgr.h>
 #endif // ifdef __ZBAOSLDR__
 
 inline EfiSystemTable*	ST = nullptr;
diff --git a/dev/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc b/dev/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc
index 036593e5..aa1d66d7 100644
--- a/dev/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc
+++ b/dev/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc
@@ -18,7 +18,7 @@ EXTERN_C void idt_handle_gpf(Kernel::UIntPtr rsp)
 	auto process = Kernel::UserProcessScheduler::The().GetCurrentProcess();
 
 	if (!process)
-		Kernel::ke_stop(RUNTIME_CHECK_PAGE);
+		Kernel::ke_panic(RUNTIME_CHECK_PAGE);
 
 	process.Leak().ProcessSignal.SignalIP		= 0UL;
 	process.Leak().ProcessSignal.SignalID		= SIGKILL;
@@ -30,7 +30,7 @@ EXTERN_C void idt_handle_gpf(Kernel::UIntPtr rsp)
 
 	process.Leak().Crash();
 
-	Kernel::ke_stop(RUNTIME_CHECK_POINTER);
+	Kernel::ke_panic(RUNTIME_CHECK_POINTER);
 }
 
 /// @brief Handle page fault.
@@ -43,7 +43,7 @@ EXTERN_C void idt_handle_pf(Kernel::UIntPtr rsp)
 	auto process = Kernel::UserProcessScheduler::The().GetCurrentProcess();
 
 	if (!process)
-		Kernel::ke_stop(RUNTIME_CHECK_PAGE);
+		Kernel::ke_panic(RUNTIME_CHECK_PAGE);
 
 	process.Leak().ProcessSignal.SignalIP		= 0UL;
 	process.Leak().ProcessSignal.SignalID		= SIGKILL;
@@ -55,7 +55,7 @@ EXTERN_C void idt_handle_pf(Kernel::UIntPtr rsp)
 
 	process.Leak().Crash();
 
-	Kernel::ke_stop(RUNTIME_CHECK_PAGE);
+	Kernel::ke_panic(RUNTIME_CHECK_PAGE);
 }
 
 /// @brief Handle scheduler interrupt.
@@ -90,7 +90,7 @@ EXTERN_C void idt_handle_math(Kernel::UIntPtr rsp)
 	auto process = Kernel::UserProcessScheduler::The().GetCurrentProcess();
 
 	if (!process)
-		Kernel::ke_stop(RUNTIME_CHECK_PAGE);
+		Kernel::ke_panic(RUNTIME_CHECK_PAGE);
 
 	process.Leak().ProcessSignal.SignalIP		= 0UL;
 	process.Leak().ProcessSignal.SignalID		= SIGKILL;
@@ -102,7 +102,7 @@ EXTERN_C void idt_handle_math(Kernel::UIntPtr rsp)
 
 	process.Leak().Crash();
 
-	Kernel::ke_stop(RUNTIME_CHECK_UNEXCPECTED);
+	Kernel::ke_panic(RUNTIME_CHECK_UNEXCPECTED);
 }
 
 /// @brief Handle any generic fault.
@@ -114,7 +114,7 @@ EXTERN_C void idt_handle_generic(Kernel::UIntPtr rsp)
 	auto process = Kernel::UserProcessScheduler::The().GetCurrentProcess();
 
 	if (!process)
-		Kernel::ke_stop(RUNTIME_CHECK_PAGE);
+		Kernel::ke_panic(RUNTIME_CHECK_PAGE);
 
 	process.Leak().ProcessSignal.SignalIP		= 0UL;
 	process.Leak().ProcessSignal.SignalID		= SIGKILL;
@@ -126,7 +126,7 @@ EXTERN_C void idt_handle_generic(Kernel::UIntPtr rsp)
 
 	process.Leak().Crash();
 
-	Kernel::ke_stop(RUNTIME_CHECK_UNEXCPECTED);
+	Kernel::ke_panic(RUNTIME_CHECK_UNEXCPECTED);
 }
 
 EXTERN_C Kernel::Void idt_handle_breakpoint(Kernel::UIntPtr rip)
@@ -134,7 +134,7 @@ EXTERN_C Kernel::Void idt_handle_breakpoint(Kernel::UIntPtr rip)
 	auto process = Kernel::UserProcessScheduler::The().GetCurrentProcess();
 
 	if (!process)
-		Kernel::ke_stop(RUNTIME_CHECK_PAGE);
+		Kernel::ke_panic(RUNTIME_CHECK_PAGE);
 
 	kcout << "Kernel: Process RIP: " << Kernel::hex_number(rip) << endl;
 	kcout << "Kernel: SIGTRAP set.\r";
@@ -158,7 +158,7 @@ EXTERN_C void idt_handle_ud(Kernel::UIntPtr rsp)
 	auto process = Kernel::UserProcessScheduler::The().GetCurrentProcess();
 
 	if (!process)
-		Kernel::ke_stop(RUNTIME_CHECK_PAGE);
+		Kernel::ke_panic(RUNTIME_CHECK_PAGE);
 
 	process.Leak().ProcessSignal.SignalIP		= 0UL;
 	process.Leak().ProcessSignal.SignalID		= SIGKILL;
@@ -170,7 +170,7 @@ EXTERN_C void idt_handle_ud(Kernel::UIntPtr rsp)
 
 	process.Leak().Crash();
 
-	Kernel::ke_stop(RUNTIME_CHECK_UNEXCPECTED);
+	Kernel::ke_panic(RUNTIME_CHECK_UNEXCPECTED);
 }
 
 /// @brief Enter syscall from assembly.
diff --git a/dev/Kernel/HALKit/AMD64/HalCoreScheduler.cc b/dev/Kernel/HALKit/AMD64/HalCoreScheduler.cc
index 02150f6e..ac103d0d 100644
--- a/dev/Kernel/HALKit/AMD64/HalCoreScheduler.cc
+++ b/dev/Kernel/HALKit/AMD64/HalCoreScheduler.cc
@@ -11,8 +11,8 @@
 #include <KernelKit/Semaphore.h>
 #include <KernelKit/UserProcessScheduler.h>
 #include <KernelKit/Timer.h>
-#include <Modules/FB/Text.h>
-#include <NewKit/Stop.h>
+#include <Modules/GfxMgr/TextMgr.h>
+#include <NewKit/KernelPanic.h>
 
 // Needed for SMP.
 #include <KernelKit/HardwareThreadScheduler.h>
diff --git a/dev/Kernel/HALKit/AMD64/HalDebugOutput.cc b/dev/Kernel/HALKit/AMD64/HalDebugOutput.cc
index 6ae5859d..ce3690b3 100644
--- a/dev/Kernel/HALKit/AMD64/HalDebugOutput.cc
+++ b/dev/Kernel/HALKit/AMD64/HalDebugOutput.cc
@@ -47,7 +47,7 @@ namespace Kernel
 			// Check if serial is faulty (i.e: not same byte as sent)
 			if (HAL::rt_in8(PORT) != 0xAE)
 			{
-				ke_stop(RUNTIME_CHECK_HANDSHAKE);
+				ke_panic(RUNTIME_CHECK_HANDSHAKE);
 			}
 
 			kState = kStateReady;
diff --git a/dev/Kernel/HALKit/AMD64/HalKernelMain.cc b/dev/Kernel/HALKit/AMD64/HalKernelMain.cc
index bf297d6a..75c41433 100644
--- a/dev/Kernel/HALKit/AMD64/HalKernelMain.cc
+++ b/dev/Kernel/HALKit/AMD64/HalKernelMain.cc
@@ -11,8 +11,8 @@
 #include <Modules/ACPI/ACPIFactoryInterface.h>
 #include <NetworkKit/IPC.h>
 #include <CFKit/Property.h>
-#include <Modules/FB/AppearanceMgr.h>
-#include <Modules/FB/Text.h>
+#include <Modules/GfxMgr/AppearanceMgr.h>
+#include <Modules/GfxMgr/TextMgr.h>
 
 EXTERN_C Kernel::VoidPtr kInterruptVectorTable[];
 EXTERN_C Kernel::VoidPtr mp_user_switch_proc;
@@ -79,12 +79,12 @@ EXTERN_C void hal_init_platform(
 	Kernel::HAL::GDTLoader gdt_loader;
 	gdt_loader.Load(gdt_reg);
 
-	Kernel::ke_stop(RUNTIME_CHECK_BOOTSTRAP);
+	Kernel::ke_panic(RUNTIME_CHECK_BOOTSTRAP);
 }
 
 EXTERN_C Kernel::Void hal_real_init(Kernel::Void) noexcept
 {
-	CG::ui_draw_background();
+	UI::ui_draw_background();
 
 	auto str_proc = Kernel::rt_alloc_string("System");
 	Kernel::rtl_create_process(rtl_kernel_main, str_proc);
diff --git a/dev/Kernel/HALKit/ARM64/HalKernelMain.cc b/dev/Kernel/HALKit/ARM64/HalKernelMain.cc
index 3892e31b..ff4676e4 100644
--- a/dev/Kernel/HALKit/ARM64/HalKernelMain.cc
+++ b/dev/Kernel/HALKit/ARM64/HalKernelMain.cc
@@ -5,7 +5,7 @@
 ------------------------------------------- */
 
 #include <ArchKit/ArchKit.h>
-#include <Modules/FB/FB.h>
+#include <Modules/GfxMgr/FBMgr.h>
 #include <FirmwareKit/Handover.h>
 #include <KernelKit/FileMgr.h>
 #include <KernelKit/Heap.h>
@@ -15,7 +15,7 @@
 #include <KernelKit/CodeMgr.h>
 #include <Modules/ACPI/ACPIFactoryInterface.h>
 #include <NetworkKit/IPC.h>
-#include <Modules/FB/AppearanceMgr.h>
+#include <Modules/GfxMgr/AppearanceMgr.h>
 #include <CFKit/Property.h>
 
 Kernel::Void hal_real_init(Kernel::Void) noexcept;
@@ -47,7 +47,7 @@ EXTERN_C void hal_init_platform(
 
 	/// @note do initialize the interrupts after it.
 
-	CG::ui_draw_background();
+	UI::ui_draw_background();
 
 	auto str_proc = Kernel::rt_alloc_string("System");
 	Kernel::rtl_create_process(rtl_kernel_main, str_proc);
diff --git a/dev/Kernel/HALKit/ARM64/Storage/.gitkeep b/dev/Kernel/HALKit/ARM64/Storage/.gitkeep
deleted file mode 100644
index e69de29b..00000000
--- a/dev/Kernel/HALKit/ARM64/Storage/.gitkeep
+++ /dev/null
diff --git a/dev/Kernel/HALKit/ARM64/Storage/HalFlash.cc b/dev/Kernel/HALKit/ARM64/Storage/HalFlashMemory.cc
index 9bd71b57..d5a9ecf4 100644
--- a/dev/Kernel/HALKit/ARM64/Storage/HalFlash.cc
+++ b/dev/Kernel/HALKit/ARM64/Storage/HalFlashMemory.cc
@@ -10,13 +10,13 @@
 /// @file Flash.cc
 /// @brief Flash memory builtin.
 
-#ifdef __USE_MBCI_FLASH__
+#ifdef ZKA_USE_MBCI_FLASH
 
 #define kMaxFlash (4U)
 
 namespace Kernel
 {
-	/// /:/BRIDGE/FLSH/1
+	/// /Mount/Flash/n
 	constexpr auto kFlashBridgeMagic	= "FLSH";
 	constexpr auto kFlashBridgeRevision = 1;
 
@@ -63,4 +63,4 @@ namespace Kernel
 	}
 } // namespace Kernel
 
-#endif // if __USE_MBCI_FLASH__ (Bridge)
+#endif // if ZKA_USE_MBCI_FLASH (Bridge)
diff --git a/dev/Kernel/KernelKit/DebugOutput.h b/dev/Kernel/KernelKit/DebugOutput.h
index 42cd8748..af9c5b79 100644
--- a/dev/Kernel/KernelKit/DebugOutput.h
+++ b/dev/Kernel/KernelKit/DebugOutput.h
@@ -192,7 +192,7 @@ namespace Kernel
 #endif // ifdef kcout
 
 #define kcout                                                                                               \
-	(Kernel::TerminalDevice::The() << "\e[0;31m [ " << __FILE__ << ": LINE: " << Kernel::number(__LINE__)); \
+	(Kernel::TerminalDevice::The() << "\e[0;31m [ (" << __FILE__ << ") Line: " << Kernel::number(__LINE__)); \
 	(Kernel::TerminalDevice::The() << " ] \e[0m"                                                            \
 								   << ": ")
 #define endl Kernel::TerminalDevice::The() << Kernel::end_line()
diff --git a/dev/Kernel/KernelKit/Heap.h b/dev/Kernel/KernelKit/Heap.h
index 6c7e04bd..90ed6266 100644
--- a/dev/Kernel/KernelKit/Heap.h
+++ b/dev/Kernel/KernelKit/Heap.h
@@ -11,7 +11,7 @@
 // file: Heap.h
 // description: heap allocation support.
 
-#include <NewKit/Stop.h>
+#include <NewKit/KernelPanic.h>
 #include <KernelKit/LPC.h>
 #include <HintKit/CompilerHint.h>
 
diff --git a/dev/Kernel/NewKit/DriverMgr.h b/dev/Kernel/NewKit/DriverMgr.h
new file mode 100644
index 00000000..a23ce4f2
--- /dev/null
+++ b/dev/Kernel/NewKit/DriverMgr.h
@@ -0,0 +1,19 @@
+
+/* -------------------------------------------
+
+	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
+
+------------------------------------------- */
+
+#pragma once
+
+#include <NewKit/Defines.h>
+
+/// @file DriverMgr.h
+/// @brief Driver loader manager.
+
+namespace Kernel
+{
+    class UserDriver;
+    class KernelDriver;
+}
\ No newline at end of file
diff --git a/dev/Kernel/NewKit/KString.h b/dev/Kernel/NewKit/KString.h
index a7020a10..9ea2f0e4 100644
--- a/dev/Kernel/NewKit/KString.h
+++ b/dev/Kernel/NewKit/KString.h
@@ -10,7 +10,7 @@
 #include <NewKit/Defines.h>
 #include <NewKit/ErrorOr.h>
 #include <NewKit/Utils.h>
-#include <NewKit/Stop.h>
+#include <NewKit/KernelPanic.h>
 
 #define cMinimumStringSize 8196
 
diff --git a/dev/Kernel/NewKit/Stop.h b/dev/Kernel/NewKit/KernelPanic.h
index 0d7bf27b..7fc2ab30 100644
--- a/dev/Kernel/NewKit/Stop.h
+++ b/dev/Kernel/NewKit/KernelPanic.h
@@ -57,7 +57,7 @@ namespace Kernel
 		STATIC Void Recover() noexcept;
 	};
 
-	void ke_stop(const Int32& id);
+	void ke_panic(const Int32& id);
 } // namespace Kernel
 
 #ifdef TRY
diff --git a/dev/Kernel/NewKit/New.h b/dev/Kernel/NewKit/New.h
index eb6c33e4..8ee33232 100644
--- a/dev/Kernel/NewKit/New.h
+++ b/dev/Kernel/NewKit/New.h
@@ -4,11 +4,13 @@
 	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 ------------------------------------------- */
+
 #pragma once
 
 #include <KernelKit/Heap.h>
 
-typedef __SIZE_TYPE__ size_t; // gcc will complain about that
+/// @note compatible with tk too.
+typedef __SIZE_TYPE__ size_t;
 
 void* operator new(size_t ptr);
 void* operator new[](size_t ptr);
diff --git a/dev/Kernel/NewKit/NewKit.h b/dev/Kernel/NewKit/NewKit.h
index e17c3465..e32e96b4 100644
--- a/dev/Kernel/NewKit/NewKit.h
+++ b/dev/Kernel/NewKit/NewKit.h
@@ -11,7 +11,7 @@
 #include <NewKit/ArrayList.h>
 #include <NewKit/ErrorOr.h>
 #include <NewKit/Json.h>
-#include <NewKit/Stop.h>
+#include <NewKit/KernelPanic.h>
 #include <NewKit/MutableArray.h>
 #include <NewKit/New.h>
 #include <NewKit/OwnPtr.h>
diff --git a/dev/Kernel/NewKit/OwnPtr.h b/dev/Kernel/NewKit/OwnPtr.h
index 36d1cdea..4f1cec7a 100644
--- a/dev/Kernel/NewKit/OwnPtr.h
+++ b/dev/Kernel/NewKit/OwnPtr.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include <NewKit/Defines.h>
-#include <NewKit/Stop.h>
+#include <NewKit/KernelPanic.h>
 #include <NewKit/Ref.h>
 
 namespace Kernel
diff --git a/dev/Kernel/NewKit/Ref.h b/dev/Kernel/NewKit/Ref.h
index 75500693..34b8891a 100644
--- a/dev/Kernel/NewKit/Ref.h
+++ b/dev/Kernel/NewKit/Ref.h
@@ -9,7 +9,7 @@
 #define _NEWKIT_REF_H_
 
 #include <NewKit/Defines.h>
-#include <NewKit/Stop.h>
+#include <NewKit/KernelPanic.h>
 #include <KernelKit/Heap.h>
 
 namespace Kernel
diff --git a/dev/Kernel/NewKit/SwapMgr.h b/dev/Kernel/NewKit/SwapMgr.h
new file mode 100644
index 00000000..822a1565
--- /dev/null
+++ b/dev/Kernel/NewKit/SwapMgr.h
@@ -0,0 +1,21 @@
+
+/* -------------------------------------------
+
+	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
+
+------------------------------------------- */
+
+#pragma once
+
+#include <NewKit/Defines.h>
+
+#define kSwapMgrBlockMaxSize mib_cast(16)
+#define KSwapMgrBlockMagic "SWEP "
+
+/// @file SwapMgr.h
+/// @brief Virtual memory swap API.
+
+namespace Kernel
+{
+    class UserSwapProcess;
+}
\ No newline at end of file
diff --git a/dev/Kernel/NewKit/ThreadMgr.h b/dev/Kernel/NewKit/ThreadMgr.h
new file mode 100644
index 00000000..8148c28d
--- /dev/null
+++ b/dev/Kernel/NewKit/ThreadMgr.h
@@ -0,0 +1,20 @@
+
+/* -------------------------------------------
+
+	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
+
+------------------------------------------- */
+
+#pragma once
+
+#include <NewKit/Defines.h>
+
+/// @file ThreadMgr.h
+/// @brief This file takes care of creating processes/threads from a subsystem context.
+
+namespace Kernel
+{
+    class UserSubsystem;
+    class UserEnvVar;
+    class UserEnv;
+}
\ No newline at end of file
diff --git a/dev/Kernel/src/ACPIFactoryInterface.cc b/dev/Kernel/src/ACPIFactoryInterface.cc
index 424a951a..83890220 100644
--- a/dev/Kernel/src/ACPIFactoryInterface.cc
+++ b/dev/Kernel/src/ACPIFactoryInterface.cc
@@ -37,7 +37,7 @@ namespace Kernel
 		if (num < 1)
 		{
 			/// stop here, we should have entries...
-			ke_stop(RUNTIME_CHECK_ACPI);
+			ke_panic(RUNTIME_CHECK_ACPI);
 			return ErrorOr<voidPtr>{-1};
 		}
 
diff --git a/dev/Kernel/src/BitMapMgr.cc b/dev/Kernel/src/BitMapMgr.cc
index be9f73b8..f73ea911 100644
--- a/dev/Kernel/src/BitMapMgr.cc
+++ b/dev/Kernel/src/BitMapMgr.cc
@@ -13,7 +13,7 @@
 #endif
 
 #include <NewKit/Defines.h>
-#include <NewKit/Stop.h>
+#include <NewKit/KernelPanic.h>
 
 #define kBitMapMagic (0x10210U)
 
diff --git a/dev/Kernel/src/FS/HPFS.cc b/dev/Kernel/src/FS/HPFS.cc
index 8aba73ac..98c41f23 100644
--- a/dev/Kernel/src/FS/HPFS.cc
+++ b/dev/Kernel/src/FS/HPFS.cc
@@ -12,7 +12,7 @@
 #include <FSKit/HPFS.h>
 #include <KernelKit/LPC.h>
 #include <NewKit/Crc32.h>
-#include <NewKit/Stop.h>
+#include <NewKit/KernelPanic.h>
 #include <NewKit/KString.h>
 #include <NewKit/Utils.h>
 #include <FirmwareKit/EPM.h>
diff --git a/dev/Kernel/src/FS/NeFS.cc b/dev/Kernel/src/FS/NeFS.cc
index 1dd08e4f..650d42c3 100644
--- a/dev/Kernel/src/FS/NeFS.cc
+++ b/dev/Kernel/src/FS/NeFS.cc
@@ -14,7 +14,7 @@
 #include <Modules/Flash/Flash.h>
 #include <KernelKit/LPC.h>
 #include <NewKit/Crc32.h>
-#include <NewKit/Stop.h>
+#include <NewKit/KernelPanic.h>
 #include <NewKit/KString.h>
 #include <NewKit/Utils.h>
 #include <KernelKit/UserProcessScheduler.h>
diff --git a/dev/Kernel/src/Heap.cc b/dev/Kernel/src/Heap.cc
index 77425670..2575bbcc 100644
--- a/dev/Kernel/src/Heap.cc
+++ b/dev/Kernel/src/Heap.cc
@@ -105,7 +105,7 @@ namespace Kernel
 			return nullptr;
 
 		kcout << "This function is not implemented by minOSKrnl, please use the BSD's realloc instead.\r";
-		ke_stop(RUNTIME_CHECK_PROCESS);
+		ke_panic(RUNTIME_CHECK_PROCESS);
 
 		return nullptr;
 	}
@@ -235,7 +235,7 @@ namespace Kernel
 				{
 					if (!heap_info_ptr->fUser)
 					{
-						ke_stop(RUNTIME_CHECK_POINTER);
+						ke_panic(RUNTIME_CHECK_POINTER);
 					}
 				}
 			}
diff --git a/dev/Kernel/src/KernelMain.cc b/dev/Kernel/src/KernelMain.cc
index cc889619..d3498f24 100644
--- a/dev/Kernel/src/KernelMain.cc
+++ b/dev/Kernel/src/KernelMain.cc
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright ZKA Technologies
+	Copyright Theater Quality Inc
 
 	File: Main.cxx
 	Purpose: Main entrypoint of kernel.
@@ -22,7 +22,7 @@
 #include <NewKit/Utils.h>
 #include <KernelKit/CodeMgr.h>
 #include <CFKit/Property.h>
-#include <Modules/FB/AppearanceMgr.h>
+#include <Modules/GfxMgr/AppearanceMgr.h>
 #include <KernelKit/Timer.h>
 
 namespace Kernel::Detail
diff --git a/dev/Kernel/src/Stop.cc b/dev/Kernel/src/KernelPanic.cc
index a8974849..0fd2ec64 100644
--- a/dev/Kernel/src/Stop.cc
+++ b/dev/Kernel/src/KernelPanic.cc
@@ -4,15 +4,15 @@
 
 ------------------------------------------- */
 
-#include <NewKit/Stop.h>
+#include <NewKit/KernelPanic.h>
 #include <ArchKit/ArchKit.h>
 #include <KernelKit/Timer.h>
 #include <KernelKit/DebugOutput.h>
 #include <NewKit/KString.h>
 #include <FirmwareKit/Handover.h>
 #include <KernelKit/FileMgr.h>
-#include <Modules/FB/FB.h>
-#include <Modules/FB/Text.h>
+#include <Modules/GfxMgr/FBMgr.h>
+#include <Modules/GfxMgr/TextMgr.h>
 
 #define kWebsiteURL "https://el-mahrouss-logic.com/products/help/"
 
@@ -25,9 +25,9 @@ namespace Kernel
 	/// @brief Stops execution of the kernel.
 	/// @param id kernel stop ID.
 	/***********************************************************************************/
-	Void ke_stop(const Kernel::Int32& id)
+	Void ke_panic(const Kernel::Int32& id)
 	{
-		cg_init();
+		fb_init();
 
 		auto panic_text = RGB(0xff, 0xff, 0xff);
 
@@ -41,7 +41,7 @@ namespace Kernel
 
 		start_y += 10;
 
-		cg_fini();
+		fb_fini();
 
 		// show text according to error id.
 
@@ -124,7 +124,7 @@ namespace Kernel
 			kcout << "FAILED: FILE: " << file << endl;
 			kcout << "FAILED: LINE: " << line << endl;
 
-			ke_stop(RUNTIME_CHECK_FAILED); // Runtime Check failed
+			ke_panic(RUNTIME_CHECK_FAILED); // Runtime Check failed
 		}
 	}
 } // namespace Kernel
diff --git a/dev/Kernel/src/LPC.cc b/dev/Kernel/src/LPC.cc
index 07a7b982..f9a13796 100644
--- a/dev/Kernel/src/LPC.cc
+++ b/dev/Kernel/src/LPC.cc
@@ -5,7 +5,7 @@
 ------------------------------------------- */
 
 #include <KernelKit/LPC.h>
-#include <NewKit/Stop.h>
+#include <NewKit/KernelPanic.h>
 
 namespace Kernel
 {
@@ -18,7 +18,7 @@ namespace Kernel
 	{
 		if (kRaiseOnBugCheck)
 		{
-			ke_stop(RUNTIME_CHECK_BAD_BEHAVIOR);
+			ke_panic(RUNTIME_CHECK_BAD_BEHAVIOR);
 		}
 
 		return No;
diff --git a/dev/Kernel/src/PEFCodeMgr.cc b/dev/Kernel/src/PEFCodeMgr.cc
index a27db7e3..a8205004 100644
--- a/dev/Kernel/src/PEFCodeMgr.cc
+++ b/dev/Kernel/src/PEFCodeMgr.cc
@@ -9,7 +9,7 @@
 #include <KernelKit/PEFCodeMgr.h>
 #include <KernelKit/UserProcessScheduler.h>
 #include <NewKit/Defines.h>
-#include <NewKit/Stop.h>
+#include <NewKit/KernelPanic.h>
 #include <NewKit/OwnPtr.h>
 #include <NewKit/KString.h>
 
diff --git a/dev/Kernel/src/User.cc b/dev/Kernel/src/User.cc
index d45c8e1b..8d1bcac9 100644
--- a/dev/Kernel/src/User.cc
+++ b/dev/Kernel/src/User.cc
@@ -12,7 +12,7 @@
 
 #include <KernelKit/User.h>
 #include <KernelKit/LPC.h>
-#include <NewKit/Stop.h>
+#include <NewKit/KernelPanic.h>
 #include <KernelKit/FileMgr.h>
 #include <KernelKit/UserProcessScheduler.h>
 #include <KernelKit/Heap.h>
diff --git a/dev/Kernel/src/UserProcessScheduler.cc b/dev/Kernel/src/UserProcessScheduler.cc
index 512b0c22..3904c222 100644
--- a/dev/Kernel/src/UserProcessScheduler.cc
+++ b/dev/Kernel/src/UserProcessScheduler.cc
@@ -256,7 +256,7 @@ namespace Kernel
 
 			if (!success)
 			{
-				ke_stop(RUNTIME_CHECK_PROCESS);
+				ke_panic(RUNTIME_CHECK_PROCESS);
 			}
 
 			this->DylibDelegate = nullptr;