diff --git a/.gitignore b/.gitignore
index 1c9bfac..d1c54fd 100755
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /.cache
 *.iso
 *.hdd
+compile_commands.json
\ No newline at end of file
diff --git a/GNUmakefile b/GNUmakefile
index d3896ee..4621bab 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -6,9 +6,9 @@ MAKEFLAGS += -rR
 ARCH := x86_64
 
 # Default user QEMU flags. These are appended to the QEMU command calls.
-QEMUFLAGS := -m 2G -debugcon stdio -no-reboot -no-shutdown
+QEMUFLAGS := -m 2G
 
-override IMAGE_NAME := sild-live-$(ARCH)
+override IMAGE_NAME := soaplin-$(ARCH)
 
 # Toolchain for building the 'limine' executable for the host.
 HOST_CC := cc
@@ -29,29 +29,8 @@ run: run-$(ARCH)
 .PHONY: run-hdd
 run-hdd: run-hdd-$(ARCH)
 
-.PHONY: ints
-ints: ovmf/ovmf-code-$(ARCH).fd $(IMAGE_NAME).iso
-	@echo "  Starting QEMU with $(IMAGE_NAME).iso"
-	@qemu-system-$(ARCH) \
-		-M q35 \
-		-drive if=pflash,unit=0,format=raw,file=ovmf/ovmf-code-$(ARCH).fd,readonly=on \
-		-cdrom $(IMAGE_NAME).iso \
-		-d int \
-		$(QEMUFLAGS)
-
-.PHONY: run-x86_64
-gdb-x86_64: ovmf/ovmf-code-$(ARCH).fd $(IMAGE_NAME).iso
-	@echo "  Starting QEMU with $(IMAGE_NAME).iso"
-	@qemu-system-$(ARCH) \
-		-M q35 \
-		-drive if=pflash,unit=0,format=raw,file=ovmf/ovmf-code-$(ARCH).fd,readonly=on \
-		-cdrom $(IMAGE_NAME).iso \
-		$(QEMUFLAGS) \
-		-S -s
-
 .PHONY: run-x86_64
 run-x86_64: ovmf/ovmf-code-$(ARCH).fd $(IMAGE_NAME).iso
-	@echo "  Starting QEMU with $(IMAGE_NAME).iso"
 	@qemu-system-$(ARCH) \
 		-M q35 \
 		-drive if=pflash,unit=0,format=raw,file=ovmf/ovmf-code-$(ARCH).fd,readonly=on \
@@ -60,7 +39,6 @@ run-x86_64: ovmf/ovmf-code-$(ARCH).fd $(IMAGE_NAME).iso
 
 .PHONY: run-hdd-x86_64
 run-hdd-x86_64: ovmf/ovmf-code-$(ARCH).fd $(IMAGE_NAME).hdd
-	@echo "  Starting QEMU with $(IMAGE_NAME).hdd"
 	@qemu-system-$(ARCH) \
 		-M q35 \
 		-drive if=pflash,unit=0,format=raw,file=ovmf/ovmf-code-$(ARCH).fd,readonly=on \
@@ -69,7 +47,6 @@ run-hdd-x86_64: ovmf/ovmf-code-$(ARCH).fd $(IMAGE_NAME).hdd
 
 .PHONY: run-aarch64
 run-aarch64: ovmf/ovmf-code-$(ARCH).fd $(IMAGE_NAME).iso
-	@echo "  Starting QEMU with $(IMAGE_NAME).iso"
 	@qemu-system-$(ARCH) \
 		-M virt \
 		-cpu cortex-a72 \
@@ -83,7 +60,6 @@ run-aarch64: ovmf/ovmf-code-$(ARCH).fd $(IMAGE_NAME).iso
 
 .PHONY: run-hdd-aarch64
 run-hdd-aarch64: ovmf/ovmf-code-$(ARCH).fd $(IMAGE_NAME).hdd
-	@echo "  Starting QEMU with $(IMAGE_NAME).hdd"
 	@qemu-system-$(ARCH) \
 		-M virt \
 		-cpu cortex-a72 \
@@ -97,7 +73,6 @@ run-hdd-aarch64: ovmf/ovmf-code-$(ARCH).fd $(IMAGE_NAME).hdd
 
 .PHONY: run-riscv64
 run-riscv64: ovmf/ovmf-code-$(ARCH).fd $(IMAGE_NAME).iso
-	@echo "  Starting QEMU with $(IMAGE_NAME).iso"
 	@qemu-system-$(ARCH) \
 		-M virt \
 		-cpu rv64 \
@@ -111,7 +86,6 @@ run-riscv64: ovmf/ovmf-code-$(ARCH).fd $(IMAGE_NAME).iso
 
 .PHONY: run-hdd-riscv64
 run-hdd-riscv64: ovmf/ovmf-code-$(ARCH).fd $(IMAGE_NAME).hdd
-	@echo "  Starting QEMU with $(IMAGE_NAME).hdd"
 	@qemu-system-$(ARCH) \
 		-M virt \
 		-cpu rv64 \
@@ -125,7 +99,6 @@ run-hdd-riscv64: ovmf/ovmf-code-$(ARCH).fd $(IMAGE_NAME).hdd
 
 .PHONY: run-loongarch64
 run-loongarch64: ovmf/ovmf-code-$(ARCH).fd $(IMAGE_NAME).iso
-	@echo "  Starting QEMU with $(IMAGE_NAME).iso"
 	@qemu-system-$(ARCH) \
 		-M virt \
 		-cpu la464 \
@@ -139,7 +112,6 @@ run-loongarch64: ovmf/ovmf-code-$(ARCH).fd $(IMAGE_NAME).iso
 
 .PHONY: run-hdd-loongarch64
 run-hdd-loongarch64: ovmf/ovmf-code-$(ARCH).fd $(IMAGE_NAME).hdd
-	@echo "  Starting QEMU with $(IMAGE_NAME).hdd"
 	@qemu-system-$(ARCH) \
 		-M virt \
 		-cpu la464 \
@@ -154,7 +126,6 @@ run-hdd-loongarch64: ovmf/ovmf-code-$(ARCH).fd $(IMAGE_NAME).hdd
 
 .PHONY: run-bios
 run-bios: $(IMAGE_NAME).iso
-	@echo "  Starting QEMU with $(IMAGE_NAME).iso"
 	@qemu-system-$(ARCH) \
 		-M q35 \
 		-cdrom $(IMAGE_NAME).iso \
@@ -163,76 +134,75 @@ run-bios: $(IMAGE_NAME).iso
 
 .PHONY: run-hdd-bios
 run-hdd-bios: $(IMAGE_NAME).hdd
-	@echo "  Starting QEMU with $(IMAGE_NAME).hdd"
 	@qemu-system-$(ARCH) \
 		-M q35 \
 		-hda $(IMAGE_NAME).hdd \
 		$(QEMUFLAGS)
 
 ovmf/ovmf-code-$(ARCH).fd:
+	@echo "  DEPS  Downloading OVMF for $(ARCH)..."
 	@mkdir -p ovmf
-	@curl -Lo $@ https://github.com/osdev0/edk2-ovmf-nightly/releases/latest/download/ovmf-code-$(ARCH).fd
+	@curl -Lo $@ https://github.com/osdev0/edk2-ovmf-nightly/releases/latest/download/ovmf-code-$(ARCH).fd > /dev/null 2>&1
 	@case "$(ARCH)" in \
 		aarch64) dd if=/dev/zero of=$@ bs=1 count=0 seek=67108864 2>/dev/null;; \
 		riscv64) dd if=/dev/zero of=$@ bs=1 count=0 seek=33554432 2>/dev/null;; \
-	@esac
+	esac
 
 limine/limine:
+	@echo "  DEPS  Downloading Limine binaries..."
 	@rm -rf limine
-	@git clone https://github.com/limine-bootloader/limine.git --branch=v9.x-binary --depth=1
+	@git clone https://github.com/limine-bootloader/limine.git --branch=v9.x-binary --depth=1 > /dev/null 2>&1
 	@$(MAKE) -C limine \
 		CC="$(HOST_CC)" \
 		CFLAGS="$(HOST_CFLAGS)" \
 		CPPFLAGS="$(HOST_CPPFLAGS)" \
 		LDFLAGS="$(HOST_LDFLAGS)" \
-		LIBS="$(HOST_LIBS)"
-	@echo "  Limine installer has been built"
+		LIBS="$(HOST_LIBS)" > /dev/null 2>&1
 
 kernel-deps:
 	@./kernel/get-deps
 	@touch kernel-deps
-	@echo "  Kernel dependencies have been downloaded"
 
 .PHONY: kernel
 kernel: kernel-deps
-	$(MAKE) -C kernel
+	@$(MAKE) -C kernel
+	@echo "Soaplin $(ARCH) has been compiled successfully."
 
 $(IMAGE_NAME).iso: limine/limine kernel
 	@rm -rf iso_root
 	@mkdir -p iso_root/boot
-	@cp -v kernel/bin-$(ARCH)/soaplin iso_root/boot/
+	@cp kernel/bin-$(ARCH)/kernel iso_root/boot/
 	@mkdir -p iso_root/boot/limine
-	@cp -v limine.conf iso_root/boot/limine/
+	@cp limine.conf iso_root/boot/limine/
 	@mkdir -p iso_root/EFI/BOOT
 ifeq ($(ARCH),x86_64)
-	@cp -v testing/sk-hello.elf iso_root/
-	@cp -v limine/limine-bios.sys limine/limine-bios-cd.bin limine/limine-uefi-cd.bin iso_root/boot/limine/
-	@cp -v limine/BOOTX64.EFI iso_root/EFI/BOOT/
-	@cp -v limine/BOOTIA32.EFI iso_root/EFI/BOOT/
+	@cp limine/limine-bios.sys limine/limine-bios-cd.bin limine/limine-uefi-cd.bin iso_root/boot/limine/
+	@cp limine/BOOTX64.EFI iso_root/EFI/BOOT/
+	@cp limine/BOOTIA32.EFI iso_root/EFI/BOOT/
 	@xorriso -as mkisofs -R -r -J -b boot/limine/limine-bios-cd.bin \
 		-no-emul-boot -boot-load-size 4 -boot-info-table -hfsplus \
 		-apm-block-size 2048 --efi-boot boot/limine/limine-uefi-cd.bin \
 		-efi-boot-part --efi-boot-image --protective-msdos-label \
-		iso_root -o $(IMAGE_NAME).iso
-	@./limine/limine bios-install $(IMAGE_NAME).iso
+		iso_root -o $(IMAGE_NAME).iso > /dev/null 2>&1
+	@./limine/limine bios-install $(IMAGE_NAME).iso > /dev/null 2>&1
 endif
 ifeq ($(ARCH),aarch64)
-	@cp -v limine/limine-uefi-cd.bin iso_root/boot/limine/
-	@cp -v limine/BOOTAA64.EFI iso_root/EFI/BOOT/
+	@cp limine/limine-uefi-cd.bin iso_root/boot/limine/
+	@cp limine/BOOTAA64.EFI iso_root/EFI/BOOT/
 	@xorriso -as mkisofs -R -r -J \
 		-hfsplus -apm-block-size 2048 \
 		--efi-boot boot/limine/limine-uefi-cd.bin \
 		-efi-boot-part --efi-boot-image --protective-msdos-label \
-		iso_root -o $(IMAGE_NAME).iso
+		iso_root -o $(IMAGE_NAME).iso > /dev/null 2>&1
 endif
 ifeq ($(ARCH),riscv64)
-	@cp -v limine/limine-uefi-cd.bin iso_root/boot/limine/
-	@cp -v limine/BOOTRISCV64.EFI iso_root/EFI/BOOT/
+	@cp limine/limine-uefi-cd.bin iso_root/boot/limine/
+	@cp limine/BOOTRISCV64.EFI iso_root/EFI/BOOT/
 	@xorriso -as mkisofs -R -r -J \
 		-hfsplus -apm-block-size 2048 \
 		--efi-boot boot/limine/limine-uefi-cd.bin \
 		-efi-boot-part --efi-boot-image --protective-msdos-label \
-		iso_root -o $(IMAGE_NAME).iso
+		iso_root -o $(IMAGE_NAME).iso > /dev/null 2>&1
 endif
 ifeq ($(ARCH),loongarch64)
 	@cp -v limine/limine-uefi-cd.bin iso_root/boot/limine/
@@ -241,19 +211,19 @@ ifeq ($(ARCH),loongarch64)
 		-hfsplus -apm-block-size 2048 \
 		--efi-boot boot/limine/limine-uefi-cd.bin \
 		-efi-boot-part --efi-boot-image --protective-msdos-label \
-		iso_root -o $(IMAGE_NAME).iso
+		iso_root -o $(IMAGE_NAME).iso > /dev/null 2>&1
 endif
 	@rm -rf iso_root
-	@echo "  The final ISO image has been created: $(IMAGE_NAME).iso"
+	@echo "Soaplin $(ARCH) test disc has been built successfully."
 
 $(IMAGE_NAME).hdd: limine/limine kernel
 	@rm -f $(IMAGE_NAME).hdd
 	@dd if=/dev/zero bs=1M count=0 seek=64 of=$(IMAGE_NAME).hdd
-	@echo "  Creating $(IMAGE_NAME).hdd"
-	@PATH=$$PATH:/usr/sbin:/sbin sgdisk $(IMAGE_NAME).hdd -n 1:2048 -t 1:ef00
-	@echo "  Creating partition table"
 ifeq ($(ARCH),x86_64)
-	@./limine/limine bios-install $(IMAGE_NAME).hdd
+	@PATH=$$PATH:/usr/sbin:/sbin sgdisk $(IMAGE_NAME).hdd -n 1:2048 -t 1:ef00 -m 1
+	@./limine/limine bios-install $(IMAGE_NAME).hdd > /dev/null 2>&1
+else
+	@PATH=$$PATH:/usr/sbin:/sbin sgdisk $(IMAGE_NAME).hdd -n 1:2048 -t 1:ef00
 endif
 	@mformat -i $(IMAGE_NAME).hdd@@1M
 	@mmd -i $(IMAGE_NAME).hdd@@1M ::/EFI ::/EFI/BOOT ::/boot ::/boot/limine
@@ -273,22 +243,16 @@ endif
 ifeq ($(ARCH),loongarch64)
 	@mcopy -i $(IMAGE_NAME).hdd@@1M limine/BOOTLOONGARCH64.EFI ::/EFI/BOOT
 endif
-	@echo "  Installed Limine bootloader"
+	@echo "Soaplin $(ARCH) test drive has been built successfully."
 
 .PHONY: clean
 clean:
 	@$(MAKE) -C kernel clean
 	@rm -rf iso_root $(IMAGE_NAME).iso $(IMAGE_NAME).hdd
-	@echo "  The output files have been removed."
+	@echo "Soaplin output files has been deleted."
 
 .PHONY: distclean
 distclean:
 	@$(MAKE) -C kernel distclean
 	@rm -rf iso_root *.iso *.hdd kernel-deps limine ovmf
-	@echo "  The output & downloaded files have been removed."
-
-# Make some function to run clang-format all over the kernel
-.PHONY: format
-format:
-	@clang-format -i -style=file $(shell find kernel/src -name '*.c' -or -name '*.h')
-	@echo "  Kernel source code formatted"
\ No newline at end of file
+	@echo "Soaplin output files & downloaded dependencies has been deleted."
diff --git a/LICENSE b/LICENSE
index 6dd09b4..e24565f 100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2025 Raphaël M.
+Copyright (C) 2025 The SILD Project
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/README.md b/README.md
index 73f84a3..91d8cd6 100755
--- a/README.md
+++ b/README.md
@@ -1,23 +1,16 @@
-# Soaplin
-The Soaplin kernel is a new Unix-like operating system kernel.
+# Soaplin (rewrite)
+This is a carefully rewritten version of Soaplin, that should be held with super glue instead of
+0.99$ duct tape bought on TEMU.
 
 ## Features
-* x86_64 support (kinda)
-* Memory management (VMM/PMM)
-* Simple pre-emptive scheduler
-* Ring 3 (user mode) support
-* ELF loader
+* Support for compiling the kernel on armv8, RISC-V, and LoongArch64 (even though the kernel doesn't do anything on these architectures)
+* Free list PMM with lazy loading
+* x86_64 paging
+* ACPI & MADT
+* IOAPIC / LAPIC
 
-## In the works
-* Virtual File System
-* FPU support
-
-## To come
-* RTC support
-* EXT2 driver 
-* FAT32 driver
-* CPIO-based init ram disk
-* Video driver for Bochs graphics adapter, and the VMware display adapter.
-
-## Known bugs
-* If a user process calls the syscall handler by using interrupts, the system may crash due to a Page Fault.
\ No newline at end of file
+## To do
+* SMP
+* Multithreaded scheduler
+* VFS
+* Tar file system
\ No newline at end of file
diff --git a/compile_commands.json b/compile_commands.json
deleted file mode 100644
index cf2888f..0000000
--- a/compile_commands.json
+++ /dev/null
@@ -1,78 +0,0 @@
-[
-  {
-    "arguments": [
-      "/usr/bin/cc",
-      "-g",
-      "-O2",
-      "-pipe",
-      "-Wall",
-      "-Wextra",
-      "-std=gnu11",
-      "-nostdinc",
-      "-ffreestanding",
-      "-fno-stack-protector",
-      "-fno-stack-check",
-      "-fno-PIC",
-      "-ffunction-sections",
-      "-fdata-sections",
-      "-m64",
-      "-march=x86-64",
-      "-mno-80387",
-      "-mno-mmx",
-      "-mno-sse",
-      "-mno-sse2",
-      "-mno-red-zone",
-      "-mcmodel=kernel",
-      "-I",
-      "src",
-      "-isystem",
-      "freestnd-c-hdrs",
-      "-DLIMINE_API_REVISION=3",
-      "-c",
-      "-o",
-      "obj-x86_64/main.c.o",
-      "src/main.c"
-    ],
-    "directory": "/home/raphm/Projets/sild/soaplin/kernel",
-    "file": "/home/raphm/Projets/sild/soaplin/kernel/src/main.c",
-    "output": "/home/raphm/Projets/sild/soaplin/kernel/obj-x86_64/main.c.o"
-  },
-  {
-    "arguments": [
-      "/usr/bin/cc",
-      "-g",
-      "-O2",
-      "-pipe",
-      "-Wall",
-      "-Wextra",
-      "-std=gnu11",
-      "-nostdinc",
-      "-ffreestanding",
-      "-fno-stack-protector",
-      "-fno-stack-check",
-      "-fno-PIC",
-      "-ffunction-sections",
-      "-fdata-sections",
-      "-m64",
-      "-march=x86-64",
-      "-mno-80387",
-      "-mno-mmx",
-      "-mno-sse",
-      "-mno-sse2",
-      "-mno-red-zone",
-      "-mcmodel=kernel",
-      "-I",
-      "src",
-      "-isystem",
-      "freestnd-c-hdrs",
-      "-DLIMINE_API_REVISION=3",
-      "-c",
-      "-o",
-      "obj-x86_64/mm/vmm.c.o",
-      "src/mm/vmm.c"
-    ],
-    "directory": "/home/raphm/Projets/sild/soaplin/kernel",
-    "file": "/home/raphm/Projets/sild/soaplin/kernel/src/mm/vmm.c",
-    "output": "/home/raphm/Projets/sild/soaplin/kernel/obj-x86_64/mm/vmm.c.o"
-  }
-]
diff --git a/deprecated/rt.c b/deprecated/rt.c
deleted file mode 100755
index fd34f05..0000000
--- a/deprecated/rt.c
+++ /dev/null
@@ -1,85 +0,0 @@
-#include "rt.h"
-#include <font.h>
-#include <stdint.h>
-#include <mm/memop.h>
-
-static rt_context _curctx;
-
-void _rt_drawchar(unsigned char c, int x, int y, int fgcolor, int bgcolor)
-{
-	int cx,cy;
-	int mask[8]={128, 64, 32, 16, 8, 4, 2, 1};
-	unsigned char *glyph=VGA8+(int)c*16;
-
-    uint32_t *buf = _curctx.framebuffer;
-
-	for(cy=0;cy<16;cy++){
-		for(cx=0;cx<8;cx++){
-            buf[((y + cy) * _curctx.framebuffer_width) + (x + cx)] = glyph[cy]&mask[cx]?fgcolor:bgcolor;
-		}
-	}
-}
-void _rt_draw_fillchar(int x, int y, int bgcolor, int fgcolor) {
-	int cx,cy;
-    uint32_t *buf = _curctx.framebuffer;
-	for(cy=0;cy<16;cy++){
-		for(cx=0;cx<8;cx++){
-            buf[((y + cy) * _curctx.framebuffer_width) + (x + cx)] = cy > 12 ? fgcolor : bgcolor;
-		}
-	}
-}
-
-int _rt_strlen(char *str) {
-    int i = 0;
-    while (str[i] != '\0') i++;
-    return i;
-}
-
-void rt_init(rt_context ctx) {
-    // Copy the structure
-    char *src = (char*)&ctx;
-    char *dst = (char*)&_curctx;
-    for (unsigned long i = 0; i < sizeof(rt_context); i++) {
-        dst[i] = src[i];
-    }
-
-    // Fill fields
-    _curctx.term_width = _curctx.framebuffer_width / 8;
-    _curctx.term_height = _curctx.framebuffer_height / 16;
-}
-
-void rt_print(char *str) {
-    _rt_draw_fillchar(_curctx.x * 8, _curctx.y * 16, 0x0, 0x0);
-
-    for (int i = 0; i < _rt_strlen(str); i++) {
-        if (str[i] == '\n' && _curctx.use_crlf_ending)
-            if (_curctx.y * 16 >= (int)_curctx.framebuffer_height) {
-                _curctx.y = 0;
-                memset(
-                    _curctx.framebuffer, _curctx.bg_color,
-                    _curctx.framebuffer_width * _curctx.framebuffer_height * sizeof(uint32_t));
-            } else {
-                _curctx.y++;
-            }
-        else if (str[i] == '\n')
-        {
-            if (_curctx.y * 16 >= (int)_curctx.framebuffer_height) {
-                _curctx.y = 0;
-                memset(
-                    _curctx.framebuffer, _curctx.bg_color,
-                    _curctx.framebuffer_width * _curctx.framebuffer_height * sizeof(uint32_t));
-            } else {
-                _curctx.y++;
-            }
-            _curctx.x = 0;
-        }
-        else if (str[i] == '\r')
-            _curctx.x = 0;
-        else {
-            _rt_drawchar(str[i], _curctx.x * 8, _curctx.y * 16, 0xFFFFFF, 0x0);
-            _curctx.x++;
-        }
-    }
-
-    _rt_draw_fillchar(_curctx.x * 8, _curctx.y * 16, 0x0, 0xFFFFFF);
-}
\ No newline at end of file
diff --git a/deprecated/rt.h b/deprecated/rt.h
deleted file mode 100755
index fcd601c..0000000
--- a/deprecated/rt.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-typedef struct _rt_ctx {
-  // A pointer to the framebuffer.
-  void *framebuffer;
-
-  // The framebuffer width, in pixels.
-  uint32_t framebuffer_width;
-
-  // The framebuffer height, in pixels.
-  uint32_t framebuffer_height;
-
-  // Set this to 1 if you prefer using DOS line endings to UNIX line endings.
-  int use_crlf_ending;
-
-  // Do we need to show a cursor after printing text?
-  int show_cursor;
-
-  // The background color
-  uint32_t bg_color;
-
-  // The foreground color
-  uint32_t fg_color;
-
-  /*
-   * Do NOT modify everything below me!
-   */
-  // The terminal's width, in columns of 8 pixels.
-  int term_width;
-  // The terminal's height, in rows of 16 pixels.
-  int term_height;
-  // The X position of the cursor, in columns of 8 pixels.
-  int x;
-  // The Y position of the cursor, in rows of 16 pixels.
-  int y;
-} rt_context;
-
-void rt_init(rt_context ctx);
-void rt_print(char *str);
\ No newline at end of file
diff --git a/kernel/.gitignore b/kernel/.gitignore
index 4eeb3d0..27ac932 100755
--- a/kernel/.gitignore
+++ b/kernel/.gitignore
@@ -1,5 +1,5 @@
-/freestnd-c-hdrs
-/cc-runtime*
-/src/limine.h
+/compile_commands.json
+/.cache
+/src/deps
 /bin-*
 /obj-*
diff --git a/kernel/GNUmakefile b/kernel/GNUmakefile
index 7350da5..a859d42 100755
--- a/kernel/GNUmakefile
+++ b/kernel/GNUmakefile
@@ -4,7 +4,7 @@ MAKEFLAGS += -rR
 
 # This is the name that our final executable will have.
 # Change as needed.
-override OUTPUT := soaplin
+override OUTPUT := kernel
 
 # Target architecture to build for. Default to x86_64.
 ARCH := x86_64
@@ -20,9 +20,6 @@ endif
 # User controllable C compiler command.
 CC := cc
 
-# User controllable archiver command.
-AR := ar
-
 # User controllable C flags.
 CFLAGS := -g -O2 -pipe
 
@@ -39,7 +36,7 @@ LDFLAGS :=
 
 # Ensure the dependencies have been obtained.
 ifneq ($(shell ( test '$(MAKECMDGOALS)' = clean || test '$(MAKECMDGOALS)' = distclean ); echo $$?),0)
-    ifeq ($(shell ( ! test -d freestnd-c-hdrs || ! test -d cc-runtime || ! test -f src/limine.h ); echo $$?),0)
+    ifeq ($(shell ( ! test -d src/deps/freestnd-c-hdrs || ! test -f src/deps/cc-runtime.c || ! test -f src/deps/limine.h || ! test -d src/deps/flanterm ); echo $$?),0)
         $(error Please run the ./get-deps script first)
     endif
 endif
@@ -60,21 +57,22 @@ override CFLAGS += \
     -ffunction-sections \
     -fdata-sections
 
+ifeq ($(CC_IS_CLANG), 1)
+    # Force Clang to use it's own linker instead of the host's one, since it
+    # might be used for cross-compilation.
+    override LDFLAGS += \
+        -fuse-ld=lld
+endif
+
 # Internal C preprocessor flags that should not be changed by the user.
 override CPPFLAGS := \
     -I src \
-    -isystem freestnd-c-hdrs \
+    -isystem src/deps/freestnd-c-hdrs \
     $(CPPFLAGS) \
     -DLIMINE_API_REVISION=3 \
     -MMD \
     -MP
 
-ifeq ($(ARCH),x86_64)
-    # Internal nasm flags that should not be changed by the user.
-    override NASMFLAGS += \
-        -Wall
-endif
-
 # Architecture specific internal flags.
 ifeq ($(ARCH),x86_64)
     ifeq ($(CC_IS_CLANG),1)
@@ -165,62 +163,52 @@ all: bin-$(ARCH)/$(OUTPUT)
 # Include header dependencies.
 -include $(HEADER_DEPS)
 
-# Link rules for building the C compiler runtime.
-cc-runtime-$(ARCH)/cc-runtime.a: GNUmakefile cc-runtime/*
-	@rm -rf cc-runtime-$(ARCH)
-	@cp -r cc-runtime cc-runtime-$(ARCH)
-	@$(MAKE) -C cc-runtime-$(ARCH) -f cc-runtime.mk \
-		CC="$(CC)" \
-		AR="$(AR)" \
-		CFLAGS="$(CFLAGS)" \
-		CPPFLAGS='-isystem ../freestnd-c-hdrs -DCC_RUNTIME_NO_FLOAT'
-	@echo "  C runtime built"
-
 # Link rules for the final executable.
-bin-$(ARCH)/$(OUTPUT): GNUmakefile linker-$(ARCH).ld $(OBJ) cc-runtime-$(ARCH)/cc-runtime.a
-	@mkdir -p "$$(dirname $@)"
+bin-$(ARCH)/$(OUTPUT): GNUmakefile linker-$(ARCH).ld $(OBJ)
 	@echo "  LD  $@"
-	@$(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) cc-runtime-$(ARCH)/cc-runtime.a -o $@
+	@mkdir -p "$$(dirname $@)"
+	@$(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) -o $@
 
 # Compilation rules for *.c files.
 obj-$(ARCH)/%.c.o: src/%.c GNUmakefile
-	@mkdir -p "$$(dirname $@)"
 	@echo "  CC  $@"
+	@mkdir -p "$$(dirname $@)"
 	@$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
 
 # Compilation rules for *.S files.
 obj-$(ARCH)/%.S.o: src/%.S GNUmakefile
+	@echo "  CC  $@"
 	@mkdir -p "$$(dirname $@)"
-	@echo "  AS  $@"
 	@$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
 
 ifeq ($(ARCH),x86_64)
 # Compilation rules for *.asm (nasm) files.
 obj-$(ARCH)/%.asm.o: src/%.asm GNUmakefile
+	@echo "  NASM  $@"
 	@mkdir -p "$$(dirname $@)"
-	@echo "  NASM $@"
 	@nasm $(NASMFLAGS) $< -o $@
 endif
 
 # Remove object files and the final executable.
 .PHONY: clean
 clean:
-	@rm -rf bin-$(ARCH) obj-$(ARCH) cc-runtime-$(ARCH)
-	@echo "  The kernel output files have been removed."
+	@rm -rf bin-$(ARCH) obj-$(ARCH)
+
 # Remove everything built and generated including downloaded dependencies.
 .PHONY: distclean
 distclean:
-	@rm -rf bin-* obj-* freestnd-c-hdrs cc-runtime* src/limine.h
-	@echo "  The kernel output & downloaded files have been removed."
+	@rm -rf bin-* obj-* src/deps
 
 # Install the final built executable to its final on-root location.
 .PHONY: install
 install: all
 	@install -d "$(DESTDIR)$(PREFIX)/share/$(OUTPUT)"
 	@install -m 644 bin-$(ARCH)/$(OUTPUT) "$(DESTDIR)$(PREFIX)/share/$(OUTPUT)/$(OUTPUT)-$(ARCH)"
+	@echo "A new copy of Soaplin has been installed to $(DESTDIR)$(PREFIX)/share/$(OUTPUT)."
 
 # Try to undo whatever the "install" target did.
 .PHONY: uninstall
 uninstall:
 	@rm -f "$(DESTDIR)$(PREFIX)/share/$(OUTPUT)/$(OUTPUT)-$(ARCH)"
 	@-rmdir "$(DESTDIR)$(PREFIX)/share/$(OUTPUT)"
+	@echo "The copy of Soaplin at $(DESTDIR)$(PREFIX)/share/$(OUTPUT) has been deleted."
diff --git a/kernel/get-deps b/kernel/get-deps
index 97cf290..25d927b 100755
--- a/kernel/get-deps
+++ b/kernel/get-deps
@@ -1,16 +1,15 @@
 #! /bin/sh
 
-set -ex
-
 srcdir="$(dirname "$0")"
 test -z "$srcdir" && srcdir=.
 
 cd "$srcdir"
 
 clone_repo_commit() {
+    echo "  DEPS  Cloning $1 to $2 (commit: $3)"
     if test -d "$2/.git"; then
-        git -C "$2" reset --hard
-        git -C "$2" clean -fd
+        git -C "$2" reset --hard > /dev/null 2>&1
+        git -C "$2" clean -fd > /dev/null 2>&1
         if ! git -C "$2" checkout $3; then
             rm -rf "$2"
         fi
@@ -22,8 +21,8 @@ clone_repo_commit() {
         fi
     fi
     if ! test -d "$2"; then
-        git clone $1 "$2"
-        if ! git -C "$2" checkout $3; then
+        git clone $1 "$2" > /dev/null 2>&1
+        if ! git -C "$2" checkout $3 > /dev/null 2>&1; then
             rm -rf "$2"
             exit 1
         fi
@@ -32,27 +31,28 @@ clone_repo_commit() {
 
 download_by_hash() {
     DOWNLOAD_COMMAND="curl -Lo"
-    if ! command -v $DOWNLOAD_COMMAND >/dev/null 2>&1; then
+    if ! command -v "${DOWNLOAD_COMMAND%% *}" >/dev/null 2>&1; then
         DOWNLOAD_COMMAND="wget -O"
-        if ! command -v $DOWNLOAD_COMMAND >/dev/null 2>&1; then
+        if ! command -v "${DOWNLOAD_COMMAND%% *}" >/dev/null 2>&1; then
             set +x
             echo "error: Neither curl nor wget found"
             exit 1
         fi
     fi
     SHA256_COMMAND="sha256sum"
-    if ! command -v $SHA256_COMMAND >/dev/null 2>&1; then
+    if ! command -v "${SHA256_COMMAND%% *}" >/dev/null 2>&1; then
         SHA256_COMMAND="sha256"
-        if ! command -v $SHA256_COMMAND >/dev/null 2>&1; then
+        if ! command -v "${SHA256_COMMAND%% *}" >/dev/null 2>&1; then
             set +x
             echo "error: Cannot find sha256(sum) command"
             exit 1
         fi
     fi
+    echo "  DEPS  Downloading $1 to $2"
     if ! test -f "$2" || ! $SHA256_COMMAND "$2" | grep $3 >/dev/null 2>&1; then
         rm -f "$2"
         mkdir -p "$2" && rm -rf "$2"
-        $DOWNLOAD_COMMAND "$2" $1
+        $DOWNLOAD_COMMAND "$2" $1  > /dev/null 2>&1
         if ! $SHA256_COMMAND "$2" | grep $3 >/dev/null 2>&1; then
             set +x
             echo "error: Cannot download file '$2' by hash"
@@ -64,17 +64,29 @@ download_by_hash() {
     fi
 }
 
-clone_repo_commit \
-    https://github.com/osdev0/freestnd-c-hdrs-0bsd.git \
-    freestnd-c-hdrs \
-    a87c192f3eb66b0806740dc67325f9ad23fc2d0b
+mkdir src/deps
 
 clone_repo_commit \
-    https://github.com/osdev0/cc-runtime.git \
-    cc-runtime \
-    576a01179f3298a4795b92f42c088f9f8800b56b
+    https://codeberg.org/mintsuki/flanterm \
+    src/deps/flanterm \
+    bdecdcb1b7dad05ab5249e2c3e4d2c27a661e864
+
+clone_repo_commit \
+    https://codeberg.org/osdev/freestnd-c-hdrs-0bsd.git \
+    src/deps/freestnd-c-hdrs \
+    a87c192f3eb66b0806740dc67325f9ad23fc2d0b
+
+download_by_hash \
+    https://codeberg.org/osdev/cc-runtime/raw/commit/d5425655388977fa12ff9b903e554a20b20c426e/cc-runtime.c \
+    src/deps/cc-runtime.c \
+    60bb1af4f6541077b736f19bf0f5a22b5dd8a2f3bed0d9d9d89846a33ef24b74
 
 download_by_hash \
     https://github.com/limine-bootloader/limine/raw/4687a182be23939c2d9f15db970382dc353ed956/limine.h \
-    src/limine.h \
+    src/deps/limine.h \
     6879e626f34c1be25ac2f72bf43b083fc2b53887280bb0fcdaee790e258c6974
+
+download_by_hash \
+    https://github.com/charlesnicholson/nanoprintf/raw/49628bd79977478dbd7c9a1b5277c44e5d49b118/nanoprintf.h \
+    src/deps/npf.h \
+    ef496c71868b3942695f63e0215da9d25ebdfa21569c854950e8f91adb9e0bea
\ No newline at end of file
diff --git a/kernel/linker-x86_64.ld b/kernel/linker-x86_64.ld
index 8fe5465..b8e1485 100755
--- a/kernel/linker-x86_64.ld
+++ b/kernel/linker-x86_64.ld
@@ -23,39 +23,31 @@ SECTIONS
     /* that is the beginning of the region. */
     . = 0xffffffff80000000;
 
-
-    .text : {
-        text_start_ld = .;
-        *(.text .text.*)
-        text_end_ld = .;
-    } :text
-
-    /* Move to the next memory page for .limine_requests */
-    . = ALIGN(CONSTANT(MAXPAGESIZE));
-
     /* Define a section to contain the Limine requests and assign it to its own PHDR */
     .limine_requests : {
-        reqs_start_ld = .;
         KEEP(*(.limine_requests_start))
         KEEP(*(.limine_requests))
         KEEP(*(.limine_requests_end))
-        reqs_end_ld = .;
     } :limine_requests
 
+    /* Move to the next memory page for .text */
+    . = ALIGN(CONSTANT(MAXPAGESIZE));
+
+    .text : {
+        *(.text .text.*)
+    } :text
+
     /* Move to the next memory page for .rodata */
     . = ALIGN(CONSTANT(MAXPAGESIZE));
 
     .rodata : {
-        rodata_start_ld = .;
         *(.rodata .rodata.*)
-        rodata_end_ld = .;
     } :rodata
 
     /* Move to the next memory page for .data */
     . = ALIGN(CONSTANT(MAXPAGESIZE));
 
     .data : {
-        data_start_ld = .;
         *(.data .data.*)
     } :data
 
@@ -66,7 +58,6 @@ SECTIONS
     .bss : {
         *(.bss .bss.*)
         *(COMMON)
-        data_end_ld = .;
     } :data
 
     /* Discard .note.* and .eh_frame* since they may cause issues on some hosts. */
diff --git a/kernel/src/acpi/acpi.c b/kernel/src/acpi/acpi.c
new file mode 100755
index 0000000..e063caa
--- /dev/null
+++ b/kernel/src/acpi/acpi.c
@@ -0,0 +1,74 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  acpi.c - ACPI table lookup
+ */
+
+#include <stdbool.h>
+
+#include <acpi/acpi.h>
+#include <arch/cpu.h>
+#include <boot/limine.h>
+#include <lib/log.h>
+#include <mm/memop.h>
+#include <mm/pmm.h>
+#include <stdint.h>
+
+static bool     __acpi_use_xsdt;
+static uint64_t __acpi_rsdt_addr;
+
+void *acpi_find_table(char *sign) {
+    if (__acpi_use_xsdt) {
+        acpi_xsdt_t *xsdt = (acpi_xsdt_t*)__acpi_rsdt_addr;
+        uint32_t entries = (xsdt->hdr.len - sizeof(xsdt->hdr)) / 8;
+
+        for (uint32_t i = 0; i < entries; i++)
+        {
+            acpi_sdt_hdr_t *h = (acpi_sdt_hdr_t *)higher_half(*((uint64_t*)xsdt->entries + i));
+            if (!memcmp(h->sign, sign, 4))
+                return (void *) h;
+        }
+
+        return NULL;
+    }
+
+    acpi_rsdt_t *rsdt = (acpi_rsdt_t*)__acpi_rsdt_addr;
+    int entries = (rsdt->hdr.len - sizeof(rsdt->hdr)) / 4;
+    uint32_t *entries_hhalf = (uint32_t *)higher_half((uint64_t)rsdt->entries);
+
+    for (int i = 0; i < entries; i++)
+    {
+        acpi_sdt_hdr_t *h = (acpi_sdt_hdr_t *)(entries_hhalf[i] + (i * sizeof(uint32_t)));
+        if (!memcmp(h->sign, sign, 4))
+            return (void *) h;
+    }
+    
+    return NULL;
+}
+
+void acpi_init() {
+    acpi_rsdp_t *rsdp = (acpi_rsdp_t*)limine_get_rsdp();
+    if (memcmp(rsdp->sign, "RSD PTR ", 8))
+    {
+        fatal("acpi: ACPI RSDP is corrupt\n");
+        hcf();
+    }
+
+    if (rsdp->rev >= 2)
+    {
+        trace("acpi: ACPI v2.0 or later detected: Using XSDT.\n");
+
+        acpi_xsdp_t *xsdp = (acpi_xsdp_t *)rsdp;
+        __acpi_use_xsdt = 1;
+        __acpi_rsdt_addr = higher_half(xsdp->xsdt_addr);
+
+        goto initialized;
+    }
+
+    __acpi_use_xsdt = 0;
+    __acpi_rsdt_addr = higher_half(rsdp->rsdt_addr); // Do not use a pointer, to shut up the compiler.
+
+initialized:
+    trace("acpi: Initialized!\n");
+}
\ No newline at end of file
diff --git a/kernel/src/acpi/acpi.h b/kernel/src/acpi/acpi.h
new file mode 100755
index 0000000..75ee2c2
--- /dev/null
+++ b/kernel/src/acpi/acpi.h
@@ -0,0 +1,50 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  acpi.h - ACPI definitions
+ */
+
+#pragma once
+
+#include <stdint.h>
+
+typedef struct {
+    char sign[8];
+    char chksum;
+    char oemid[6];
+    char rev;
+    uint32_t rsdt_addr;
+} __attribute__((packed)) acpi_rsdp_t;
+
+typedef struct {
+    acpi_rsdp_t base;
+    uint32_t len;
+    uint64_t xsdt_addr;
+    char chksumex;
+} __attribute__((packed)) acpi_xsdp_t;
+
+typedef struct {
+    char sign[4];
+    uint32_t len;
+    uint8_t rev;
+    uint8_t chksum;
+    char oemid[6];
+    char oemtabid[8];
+    uint32_t oemrev;
+    uint32_t creaid;
+    uint32_t crearev;
+} __attribute__((packed)) acpi_sdt_hdr_t;
+
+typedef struct {
+    acpi_sdt_hdr_t hdr;
+    char entries[];
+} acpi_rsdt_t;
+
+typedef struct {
+    acpi_sdt_hdr_t hdr;
+    char entries[];
+} acpi_xsdt_t;
+
+void *acpi_find_table(char *sign);
+void  acpi_init();
\ No newline at end of file
diff --git a/kernel/src/acpi/madt.c b/kernel/src/acpi/madt.c
new file mode 100755
index 0000000..eb03144
--- /dev/null
+++ b/kernel/src/acpi/madt.c
@@ -0,0 +1,42 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  madt.c - MADT lookup
+ */
+
+#include "acpi/acpi.h"
+#include "lib/log.h"
+#include <acpi/madt.h>
+
+acpi_madt_ioapic_t* madt_ioapic_list[128];
+acpi_madt_iso_t*    madt_iso_list[128];
+
+uint32_t madt_ioapic_len = 0;
+uint32_t madt_iso_len    = 0;
+
+uint64_t *madt_lapic_addr = (uint64_t *)0;
+
+void madt_init() {
+    void *addr = acpi_find_table("APIC");
+    acpi_madt_t *madt = (acpi_madt_t *)addr;
+    uint64_t offset = 0;
+
+    while (1) {
+        if (offset > madt->hdr.len - sizeof(acpi_madt_t))
+            break;
+
+        madt_entry *entry = (madt_entry *)(madt->table + offset);
+
+        if (entry->type == 1)
+            madt_ioapic_list[madt_ioapic_len++] = (acpi_madt_ioapic_t *)entry;
+        else if (entry->type == 2)
+            madt_iso_list[madt_iso_len++] = (acpi_madt_iso_t *)entry;
+        else if (entry->type == 5)
+            madt_lapic_addr = (uint64_t *)((acpi_madt_lapic_addr_override_t *)entry)->plapic;
+
+        offset += entry->len;
+    }
+
+    trace("madt: Initialized\n");
+}
diff --git a/kernel/src/acpi/madt.h b/kernel/src/acpi/madt.h
new file mode 100755
index 0000000..78bf28b
--- /dev/null
+++ b/kernel/src/acpi/madt.h
@@ -0,0 +1,61 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  madt.h - MADT lookup
+ */
+#pragma once
+
+#include <acpi/acpi.h>
+#include <stdint.h>
+
+typedef struct {
+    acpi_sdt_hdr_t hdr;
+    uint32_t lapic_addr;
+    uint32_t flags;
+    char table[];
+} acpi_madt_t;
+
+typedef struct {
+    uint8_t type;
+    uint8_t len;
+} madt_entry;
+
+typedef struct {
+    madt_entry entry;
+    uint8_t cpu_id;
+    uint8_t lapic_id;
+    uint32_t flags;
+} acpi_madt_lapic_t;
+
+typedef struct {
+    madt_entry entry;
+    uint8_t ioapic_id;
+    uint8_t reserved;
+    uint32_t ioapic_addr;
+    uint32_t gsi_base;
+} acpi_madt_ioapic_t;
+
+typedef struct {
+    madt_entry entry;
+    uint8_t bus;
+    uint8_t source;
+    uint32_t gsi;
+    uint16_t flags;
+} acpi_madt_iso_t; // iso = interrupt source override
+
+typedef struct {
+    madt_entry entry;
+    uint16_t reserved;
+    uint64_t plapic;
+} acpi_madt_lapic_addr_override_t;
+
+extern acpi_madt_ioapic_t* madt_ioapic_list[128];
+extern acpi_madt_iso_t* madt_iso_list[128];
+
+extern uint32_t madt_ioapic_len;
+extern uint32_t madt_iso_len;
+
+extern uint64_t *lapic_addr;
+
+void madt_init();
\ No newline at end of file
diff --git a/kernel/src/arch/aarch64/cpu.c b/kernel/src/arch/aarch64/cpu.c
new file mode 100755
index 0000000..0e0f378
--- /dev/null
+++ b/kernel/src/arch/aarch64/cpu.c
@@ -0,0 +1,29 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  cpu.c - AArch64 CPU control implementation.
+ */
+
+#if defined (__aarch64__)
+
+#include <arch/cpu.h>
+
+void arch_init_stage1() {
+}
+
+void cpu_load_pm(pagemap_t pm) {
+    
+}
+
+void cpu_invalidate_page(uint64_t vaddr) {
+    
+}
+
+void hcf() {
+    for (;;) {
+        asm ("wfi");
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/kernel/src/arch/cpu.h b/kernel/src/arch/cpu.h
new file mode 100755
index 0000000..bb197f9
--- /dev/null
+++ b/kernel/src/arch/cpu.h
@@ -0,0 +1,35 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  cpu.h - CPU control and management functions.
+ */
+
+#pragma once
+
+#include "mm/paging.h"
+
+// Stage 1 initialization: Core components (such as the GDT & IDT on x86_64...)
+void arch_init_stage1();
+
+// Load a pagemap
+void cpu_load_pm(pagemap_t pm);
+
+// Invalidate a page table entry
+void cpu_invalidate_page(uint64_t vaddr);
+
+// Initialize SMP. The implementations are in arch since the Limine
+// structure changes depending on the architecture.
+void cpu_init_smp();
+
+// Initialize the CPU's timer
+void cpu_init_timer();
+
+// Initialize the APIC.
+void cpu_init_apic();
+
+// Enable/disable interrupts.
+void cpu_enable_ints(int enabled);
+
+// Disable interrupts and halt the system.
+void hcf();
\ No newline at end of file
diff --git a/kernel/src/arch/la64/cpu.c b/kernel/src/arch/la64/cpu.c
new file mode 100755
index 0000000..8b2fd40
--- /dev/null
+++ b/kernel/src/arch/la64/cpu.c
@@ -0,0 +1,29 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  cpu.c - LoongArch64 CPU control implementation.
+ */
+
+#if defined (__loongarch64)
+
+#include <arch/cpu.h>
+
+void arch_init_stage1() {
+}
+
+void cpu_load_pm(pagemap_t pm) {
+    
+}
+
+void cpu_invalidate_page(uint64_t vaddr) {
+    
+}
+
+void hcf() {
+    for (;;) {
+        asm ("idle 0");
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/kernel/src/arch/riscv/cpu.c b/kernel/src/arch/riscv/cpu.c
new file mode 100755
index 0000000..e671ac9
--- /dev/null
+++ b/kernel/src/arch/riscv/cpu.c
@@ -0,0 +1,29 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  cpu.c - RISC-V CPU control implementation.
+ */
+
+#if defined (__riscv)
+
+#include <arch/cpu.h>
+
+void arch_init_stage1() {
+}
+
+void cpu_load_pm(pagemap_t pm) {
+
+}
+
+void cpu_invalidate_page(uint64_t vaddr) {
+    
+}
+
+void hcf() {
+    for (;;) {
+        asm ("wfi");
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/kernel/src/arch/x86_64/cpu.c b/kernel/src/arch/x86_64/cpu.c
new file mode 100755
index 0000000..7a48f09
--- /dev/null
+++ b/kernel/src/arch/x86_64/cpu.c
@@ -0,0 +1,50 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  cpu.c - x86_64 CPU control implementation.
+ */
+
+#if defined (__x86_64__)
+
+#include "arch/x86_64/lapic.h"
+#include "arch/x86_64/ioapic.h"
+#include <arch/x86_64/gdt.h>
+#include <arch/x86_64/idt.h>
+#include <arch/cpu.h>
+#include <mm/pmm.h>
+#include "mm/paging.h"
+
+void arch_init_stage1() {
+    gdt_init();
+    idt_init();
+}
+
+void cpu_load_pm(pagemap_t pm) {
+  if (!pm)
+    return;
+
+  __asm__ volatile("mov %0, %%cr3" : : "r"(physical((uint64_t)pm)) : "memory");
+}
+
+void cpu_invalidate_page(uint64_t vaddr) {
+    asm volatile ( "invlpg (%0)" : : "b"(vaddr) : "memory" );
+}
+
+void cpu_enable_ints(int enabled) {
+  if (enabled) asm("sti"); else asm("cli");
+}
+
+void cpu_init_apic() {
+  lapic_init();
+  ioapic_init();
+}
+
+void hcf() {
+    asm ("cli");
+    for (;;) {
+        asm ("hlt");
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/kernel/src/fs/vfs.c b/kernel/src/arch/x86_64/cpu.h
old mode 100644
new mode 100755
similarity index 100%
rename from kernel/src/fs/vfs.c
rename to kernel/src/arch/x86_64/cpu.h
diff --git a/kernel/src/arch/x86_64/gdt.asm b/kernel/src/arch/x86_64/gdt.asm
new file mode 100755
index 0000000..4bdcbb4
--- /dev/null
+++ b/kernel/src/arch/x86_64/gdt.asm
@@ -0,0 +1,26 @@
+;
+;  The Soaplin Kernel
+;  Copyright (C) 2025 The SILD Project
+;
+;  gdt.asm - Utility for reloading the segments.
+
+bits 64
+
+section .text
+    global gdt_reload_segments
+
+gdt_reload_segments:
+   ; Reload CS register:
+   PUSH 0x08                 ; Push code segment to stack, 0x08 is a stand-in for your code segment
+   LEA RAX, [rel .reload_CS] ; Load address of .reload_CS into RAX
+   PUSH RAX                  ; Push this value to the stack
+   RETFQ                     ; Perform a far return, RETFQ or LRETQ depending on syntax
+.reload_CS:
+   ; Reload data segment registers
+   MOV   AX, 0x10 ; 0x10 is a stand-in for your data segment
+   MOV   DS, AX
+   MOV   ES, AX
+   MOV   FS, AX
+   MOV   GS, AX
+   MOV   SS, AX
+   RET
\ No newline at end of file
diff --git a/kernel/src/arch/x86_64/gdt.c b/kernel/src/arch/x86_64/gdt.c
new file mode 100755
index 0000000..ac9f4df
--- /dev/null
+++ b/kernel/src/arch/x86_64/gdt.c
@@ -0,0 +1,58 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  gdt.c - x86_64 Global Descriptor Table implementation.
+ */
+
+#include "lib/log.h"
+#if defined(__x86_64__)
+
+#include <stdint.h>
+#include <arch/x86_64/gdt.h>
+#include <mm/memop.h>
+
+gdt_table gdt = {{
+    0x0000000000000000, // 0x0, null
+
+    0x00af9b000000ffff, // 0x8, 64-bit code
+    0x00af93000000ffff, // 0x10, 64-bit data
+
+    0x00affb000000ffff, // 0x18, usermode 64-bit code
+    0x00aff3000000ffff  // 0x20, usermode 64-bit data
+}, {}};
+
+tssr tss_list[255];
+static uint64_t __gdt_kstack[4096];
+
+extern void gdt_reload_segments();
+
+void gdt_init() {
+    memset(&tss_list[0], 0, sizeof(tssr));
+    tss_list[0].rsp[0] = (uint64_t)__gdt_kstack;
+    tss_list[0].iopb = sizeof(tssr);
+    uintptr_t tss = (uintptr_t)&tss_list[0];
+
+    gdt.tss_entry = (tss_entry){
+        .length = sizeof(tss_entry),
+        .base = (uint16_t)(tss & 0xFFFF),
+        .base1 = (uint8_t)((tss >> 16) & 0xFF),
+        .flags = 0x89,
+        .flags1 = 0,
+        .base2 = (uint8_t)((tss >> 24) & 0xFF),
+        .base3 = (uint32_t)(tss >> 32),
+        .resv = 0,
+    };
+
+    gdtr gdtr = {
+        .size = (sizeof(gdt_table)) - 1,
+        .address = (uint64_t)&gdt
+    };
+
+    __asm__ volatile("lgdt %0\n\t" : : "m"(gdtr) : "memory");
+    __asm__ volatile("ltr %0\n\t" : : "r"((uint16_t)0x28)); // 0x20 (last GDT entry) + 0x8 (size of a GDT entry)
+
+    gdt_reload_segments();
+}
+
+#endif
\ No newline at end of file
diff --git a/kernel/src/sys/arch/x86_64/gdt.h b/kernel/src/arch/x86_64/gdt.h
old mode 100644
new mode 100755
similarity index 64%
rename from kernel/src/sys/arch/x86_64/gdt.h
rename to kernel/src/arch/x86_64/gdt.h
index be55cd9..d7a3e61
--- a/kernel/src/sys/arch/x86_64/gdt.h
+++ b/kernel/src/arch/x86_64/gdt.h
@@ -1,8 +1,15 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  gdt.h - x86_64 Global Descriptor Table definitions.
+ */
+
 #pragma once
 
 #include <stdint.h>
 
-typedef struct {
+typedef struct tss_entry {
   uint16_t length;
   uint16_t base;
   uint8_t base1;
@@ -14,8 +21,8 @@ typedef struct {
 } __attribute__((packed)) tss_entry;
 
 typedef struct {
-  uint64_t gdt_entries[9];
-  tss_entry tss_entry;
+  uint64_t entries[5];
+  struct tss_entry tss_entry;
 } __attribute__((packed)) gdt_table;
 
 typedef struct {
@@ -31,6 +38,6 @@ typedef struct {
   uint64_t resv2;
   uint16_t resv3;
   uint16_t iopb;
-} __attribute__((packed)) tssr; // Per CPU
+} __attribute__((packed)) tssr; // 1 TSSR per CPU.
 
-void gdt_init(char *kstack);
\ No newline at end of file
+void gdt_init();
\ No newline at end of file
diff --git a/kernel/src/arch/x86_64/idt.asm b/kernel/src/arch/x86_64/idt.asm
new file mode 100755
index 0000000..24f9435
--- /dev/null
+++ b/kernel/src/arch/x86_64/idt.asm
@@ -0,0 +1,122 @@
+;
+;  The Soaplin Kernel
+;  Copyright (C) 2025 The SILD Project
+;
+;  idt.asm - Defines the handler for IDT entries.
+;
+
+%macro pushall 0
+  push rax
+  push rcx
+  push rdx
+  push rbx
+  push rbp
+  push rsi
+  push rdi
+  push r8
+  push r9
+  push r10
+  push r11
+  push r12
+  push r13
+  push r14
+  push r15
+%endmacro
+
+%macro popall 0
+  pop r15
+  pop r14
+  pop r13
+  pop r12
+  pop r11
+  pop r10
+  pop r9
+  pop r8
+  pop rdi
+  pop rsi
+  pop rbp
+  pop rbx
+  pop rdx
+  pop rcx
+  pop rax
+%endmacro
+
+%macro isr_err_stub 1
+isr_stub_%+%1:
+    push %1
+    pushall
+    mov rdi, rsp 
+    
+    call idt_interrupt_handler
+
+    popall
+
+    add rsp, 16
+    iretq
+%endmacro
+
+%macro isr_no_err_stub 1
+isr_stub_%+%1:
+    push 0       ; push the error code (0) into the stack
+    push %1      ; push intno into the stack
+
+    pushall
+
+    mov rdi, rsp ; put the stack as the first arg.
+
+    call idt_interrupt_handler
+
+    popall
+
+    add rsp, 16
+    iretq
+%endmacro
+
+extern idt_interrupt_handler
+isr_no_err_stub 0
+isr_no_err_stub 1
+isr_no_err_stub 2
+isr_no_err_stub 3
+isr_no_err_stub 4
+isr_no_err_stub 5
+isr_no_err_stub 6
+isr_no_err_stub 7
+isr_err_stub    8
+isr_no_err_stub 9
+isr_err_stub    10
+isr_err_stub    11
+isr_err_stub    12
+isr_err_stub    13
+isr_err_stub    14
+isr_no_err_stub 15
+isr_no_err_stub 16
+isr_err_stub    17
+isr_no_err_stub 18
+isr_no_err_stub 19
+isr_no_err_stub 20
+isr_no_err_stub 21
+isr_no_err_stub 22
+isr_no_err_stub 23
+isr_no_err_stub 24
+isr_no_err_stub 25
+isr_no_err_stub 26
+isr_no_err_stub 27
+isr_no_err_stub 28
+isr_no_err_stub 29
+isr_err_stub    30
+isr_no_err_stub 31
+
+%assign i 32
+%rep    224
+    isr_no_err_stub i
+%assign i i+1
+%endrep
+
+
+global isr_stub_table
+isr_stub_table:
+%assign i 0 
+%rep    256
+    dq isr_stub_%+i
+%assign i i+1 
+%endrep
\ No newline at end of file
diff --git a/kernel/src/arch/x86_64/idt.c b/kernel/src/arch/x86_64/idt.c
new file mode 100755
index 0000000..e14ffd4
--- /dev/null
+++ b/kernel/src/arch/x86_64/idt.c
@@ -0,0 +1,111 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  idt.c - x86_64 Interrupt Descriptor Table implementation.
+ */
+
+#if defined(__x86_64__)
+
+#include <stdint.h>
+
+#include <arch/cpu.h>
+#include <arch/x86_64/idt.h>
+#include <arch/x86_64/smp.h>
+#include <arch/x86_64/ioapic.h>
+#include "arch/x86_64/lapic.h"
+#include <lib/log.h>
+
+__attribute__((aligned(0x10))) 
+static idt_entry_t idt[256];
+static idtr_t idtr;
+
+static uint8_t __idt_vectors[256];
+static interrupt_handler __idt_external_handlers[256];
+
+void idt_register_handler(uint8_t vector, void *isr) {
+  if (vector <= 16)
+    ioapic_redir_irq(bootstrap_lapic_id, vector + 32, vector, false);
+
+  __idt_external_handlers[vector] = isr;
+  __idt_vectors[vector <= 16 ? vector + 32 : vector] = vector <= 16 ? VT_HWI : VT_SWI;
+}
+
+void idt_interrupt_handler(registers_t *regs) {
+  if (__idt_vectors[regs->int_no] == VT_SPURIOUS || __idt_vectors[regs->int_no] == VT_NONE)
+    return;
+
+  if (regs->int_no < 32) {
+    fatal("Kernel panic: CPU exception %d\n", regs->int_no);
+    fatal("rax: %p, rbx: %p, rbp: %p, rdx\n", regs->rax, regs->rbx, regs->rbp, regs->rdx);
+    fatal("rdi: %p, rsi: %p, rcx: %p\n", regs->rdi, regs->rsi, regs->rcx);
+    fatal("r8: %p, r9: %p, r10: %p\n", regs->r8, regs->r8, regs->r10);
+    fatal("r11: %p, r12: %p, r13: %p\n", regs->r11, regs->r12, regs->r13);
+    fatal("r14: %p, r15: %p\n", regs->r14, regs->r15);
+    fatal("rip: %p, cs: %p, ss: %p\n", regs->rip, regs->cs, regs->ss);
+    fatal("rflags: %p, err: %d, rsp: %p\n", regs->rflags, regs->err_code, regs->rsp);
+    hcf();
+  }
+
+  int vec = regs->int_no;
+  if (vec >= 32 && vec < 48)
+    vec -= 32;
+
+  if (__idt_vectors[regs->int_no] == VT_HWI) {
+    interrupt_handler i = __idt_external_handlers[vec];
+    i(regs);
+  } else if (__idt_vectors[regs->int_no] == VT_SWI) {
+    interrupt_handler i = __idt_external_handlers[regs->int_no];
+    i(regs);
+  }
+
+  lapic_eoi();
+}
+
+void idt_set_descriptor(uint8_t vector, void* isr, uint8_t flags) {
+  idt_entry_t* descriptor = &idt[vector];
+
+  descriptor->isr_low        = (uint64_t)isr & 0xFFFF;
+  descriptor->kernel_cs      = 0x08;
+  descriptor->ist            = 0;
+  descriptor->attributes     = flags;
+  descriptor->isr_mid        = ((uint64_t)isr >> 16) & 0xFFFF;
+  descriptor->isr_high       = ((uint64_t)isr >> 32) & 0xFFFFFFFF;
+  descriptor->reserved       = 0;
+}
+
+
+extern void* isr_stub_table[];
+
+void idt_load() {
+  __asm__ volatile ("lidt %0" : : "m"(idtr));
+}
+
+void idt_init() {
+  idtr.base = (uintptr_t)&idt[0];
+  idtr.limit = (uint16_t)sizeof(idt_entry_t) * 256 - 1;
+
+  for (uint8_t vector = 0; vector < 32; vector++) {
+    idt_set_descriptor(vector, isr_stub_table[vector], 0x8E);
+    __idt_vectors[vector] = VT_EXCEPTION;
+  }
+  trace("idt: Exception vectors has been set!\n");
+
+  for (uint8_t vector = 32; vector < 48; vector++) {
+    idt_set_descriptor(vector, isr_stub_table[vector], 0x8E);
+    __idt_vectors[vector] = VT_HWI;
+  }
+  trace("idt: Hardware interrupt vectors has been set!\n");
+  for (uint16_t vector = 48; vector < 256; vector++) {
+    idt_set_descriptor(vector, isr_stub_table[vector], 0x8E);
+    __idt_vectors[vector] = VT_NONE;
+  }
+  __idt_vectors[IDT_SPURIOUS_INT] = VT_SPURIOUS;
+  trace("idt: Spurious interrupt vector has been set!\n");
+
+  //__asm__ volatile ("sti");
+  idt_load();
+  trace("arch: IDT loaded successfully\n");
+}
+
+#endif
\ No newline at end of file
diff --git a/kernel/src/arch/x86_64/idt.h b/kernel/src/arch/x86_64/idt.h
new file mode 100755
index 0000000..5afa21a
--- /dev/null
+++ b/kernel/src/arch/x86_64/idt.h
@@ -0,0 +1,63 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  idt.h - x86_64 Interrupt Descriptor Table declarations.
+ */
+#pragma once
+
+#include <stdint.h>
+
+#define VT_NONE      0
+#define VT_EXCEPTION 1
+#define VT_HWI       2
+#define VT_SWI       3
+#define VT_SPURIOUS  4
+
+#define IDT_SPURIOUS_INT 0xFF
+
+typedef struct {
+  uint64_t r15;
+  uint64_t r14;
+  uint64_t r13;
+  uint64_t r12;
+  uint64_t r11;
+  uint64_t r10;
+  uint64_t r9;
+  uint64_t r8;
+  uint64_t rdi;
+  uint64_t rsi;
+  uint64_t rbp;
+  uint64_t rbx;
+  uint64_t rdx;
+  uint64_t rcx;
+  uint64_t rax;
+  uint64_t int_no;
+  uint64_t err_code;
+  uint64_t rip;
+  uint64_t cs;
+  uint64_t rflags;
+  uint64_t rsp;
+  uint64_t ss;
+} __attribute__((packed)) registers_t;
+
+typedef void(*interrupt_handler)(registers_t*);
+
+typedef struct {
+	uint16_t    isr_low;
+	uint16_t    kernel_cs;
+	uint8_t	    ist;
+	uint8_t     attributes;
+	uint16_t    isr_mid;
+	uint32_t    isr_high;
+	uint32_t    reserved;
+} __attribute__((packed)) idt_entry_t;
+
+typedef struct {
+	uint16_t	limit;
+	uint64_t	base;
+} __attribute__((packed)) idtr_t;
+
+void idt_register_handler(uint8_t vector, void *isr);
+void idt_init(void);
+void idt_load();
\ No newline at end of file
diff --git a/kernel/src/arch/x86_64/io.h b/kernel/src/arch/x86_64/io.h
new file mode 100755
index 0000000..4892c8e
--- /dev/null
+++ b/kernel/src/arch/x86_64/io.h
@@ -0,0 +1,23 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  io.h - x86_64 I/O functions
+ */
+
+#pragma once
+
+#include <stdint.h>
+
+inline void outb(uint16_t port, uint8_t val) {
+    __asm__ volatile ( "outb %b0, %w1" : : "a"(val), "Nd"(port) : "memory");
+}
+
+inline uint8_t inb(uint16_t port) {
+    uint8_t ret;
+    __asm__ volatile ( "inb %w1, %b0"
+                   : "=a"(ret)
+                   : "Nd"(port)
+                   : "memory");
+    return ret;
+}
\ No newline at end of file
diff --git a/kernel/src/arch/x86_64/ioapic.c b/kernel/src/arch/x86_64/ioapic.c
new file mode 100755
index 0000000..831c455
--- /dev/null
+++ b/kernel/src/arch/x86_64/ioapic.c
@@ -0,0 +1,87 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  ioapic.c - I/O APIC implementation.
+ */
+
+#include <stdint.h>
+#include <stddef.h>
+
+#include <acpi/madt.h>
+#include <dev/ioapic.h>
+#include <lib/log.h>
+#include <mm/pmm.h>
+
+static void     __ioapic_write(acpi_madt_ioapic_t *ioapic, uint32_t reg, uint32_t val) {
+    *(volatile uint32_t *)(higher_half(ioapic->ioapic_addr)) = reg; 
+    *(volatile uint32_t *)(higher_half(ioapic->ioapic_addr+0x10)) = val; 
+}
+static uint32_t __ioapic_read(acpi_madt_ioapic_t *ioapic, uint32_t reg) {
+    *(volatile uint32_t *)(higher_half(ioapic->ioapic_addr)) = reg; 
+    return *(volatile uint32_t *)(higher_half(ioapic->ioapic_addr+0x10));
+}
+
+void ioapic_init() {
+    acpi_madt_ioapic_t *ioapic = madt_ioapic_list[0];
+
+    uint32_t value = __ioapic_read(ioapic, IOAPIC_VERSION);
+    uint32_t count = (value >> 16) & 0xFF;
+
+    for (uint8_t i = 0; i <= count; ++i) {
+        __ioapic_write(ioapic, 
+            IOAPIC_REDTBL+2 * i, 
+            0x00010000 | (32 + i));
+        __ioapic_write(ioapic,
+            IOAPIC_REDTBL + 2 * i + 1, 0);
+    }
+
+    trace("ioapic: Initialized\n");
+}
+
+uint32_t ioapic_gsi_count(acpi_madt_ioapic_t* ioapic) {
+  return (__ioapic_read(ioapic, 1) & 0xff0000) >> 16;
+}
+
+acpi_madt_ioapic_t *ioapic_get_gsi(uint32_t gsi) {
+  for (uint32_t i = 0; i < madt_ioapic_len; i++) {
+    acpi_madt_ioapic_t* ioapic = madt_ioapic_list[i];
+    if (ioapic->gsi_base <= gsi && ioapic->gsi_base + ioapic_gsi_count(ioapic) > gsi)
+      return ioapic;
+  }
+  return NULL;
+}
+
+void ioapic_redirect_gsi(uint32_t lapic_id, uint8_t vec, uint32_t gsi, uint16_t flags, bool mask) {
+  acpi_madt_ioapic_t* ioapic = ioapic_get_gsi(gsi);
+
+  uint64_t redirect = vec;
+
+  if ((flags & (1 << 1)) != 0) {
+    redirect |= (1 << 13);
+  }
+
+  if ((flags & (1 << 3)) != 0) {
+    redirect |= (1 << 15);
+  }
+
+  if (mask) redirect |= (1 << 16);
+  else redirect &= ~(1 << 16);
+
+  redirect |= (uint64_t)lapic_id << 56;
+
+  uint32_t redtbl = (gsi - ioapic->gsi_base) * 2 + 16;
+  __ioapic_write(ioapic, redtbl, (uint32_t)redirect);
+  __ioapic_write(ioapic, redtbl + 1, (uint32_t)(redirect >> 32));
+}
+
+void ioapic_redir_irq(uint32_t lapic_id, uint8_t vec, uint8_t irq, bool mask) {
+  uint8_t idx = 0;
+  acpi_madt_iso_t* iso = NULL;
+
+  for (idx = 0; idx < madt_iso_len; ++idx) {
+    iso = madt_iso_list[idx];
+    if (iso->source == irq) { ioapic_redirect_gsi(lapic_id, vec, iso->gsi, iso->flags, mask); return; }
+  }
+  ioapic_redirect_gsi(lapic_id, vec, irq, 0, mask);
+}
\ No newline at end of file
diff --git a/kernel/src/arch/x86_64/ioapic.h b/kernel/src/arch/x86_64/ioapic.h
new file mode 100755
index 0000000..df39a1f
--- /dev/null
+++ b/kernel/src/arch/x86_64/ioapic.h
@@ -0,0 +1,17 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  ioapic.c - I/O APIC definitions.
+ */
+
+#pragma once
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#define IOAPIC_VERSION 0x1
+#define IOAPIC_REDTBL 0x10
+
+void ioapic_init();
+void ioapic_redir_irq(uint32_t lapic_id, uint8_t vec, uint8_t irq, bool mask);
\ No newline at end of file
diff --git a/kernel/src/arch/x86_64/lapic.c b/kernel/src/arch/x86_64/lapic.c
new file mode 100755
index 0000000..f1d2bc2
--- /dev/null
+++ b/kernel/src/arch/x86_64/lapic.c
@@ -0,0 +1,39 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  lapic.c - Local APIC implementation.
+ */
+
+#include "arch/x86_64/lapic.h"
+#include "arch/x86_64/idt.h"
+#include "lib/log.h"
+#include "mm/pmm.h"
+#include <stdint.h>
+
+static uint64_t __lapic_pbase = 0xfee00000;
+static uint64_t __lapic_vbase;
+
+static void     __lapic_write(uint32_t reg, uint32_t val) { *(volatile uint32_t *)(__lapic_vbase + reg) = val; }
+static uint32_t __lapic_read(uint32_t reg) { return *(volatile uint32_t *)(__lapic_vbase + reg); }
+static void     __lapic_write_svr(uint32_t reg, lapic_svr_entry e) { *(volatile uint32_t *)(__lapic_vbase + reg) = *(uint32_t*)&e; }
+
+void lapic_init() {
+    __lapic_vbase = higher_half(__lapic_pbase);
+    __lapic_write_svr(LAPIC_SVR, (lapic_svr_entry){ .swenabled = true, .vec = IDT_SPURIOUS_INT });
+    trace("lapic: Initialized\n");
+}
+
+void lapic_eoi() {
+    __lapic_write(LAPIC_EOI, 0x0);
+}
+
+void lapic_ipi(uint32_t id, uint8_t dat) {
+  __lapic_write(0x310, id << LAPIC_ICDESTSHIFT);
+  __lapic_write(0x300, dat);
+}
+
+
+uint32_t lapic_get_id() {
+    return __lapic_read(LAPIC_ID) >> LAPIC_ICDESTSHIFT;
+}
\ No newline at end of file
diff --git a/kernel/src/arch/x86_64/lapic.h b/kernel/src/arch/x86_64/lapic.h
new file mode 100755
index 0000000..e473a76
--- /dev/null
+++ b/kernel/src/arch/x86_64/lapic.h
@@ -0,0 +1,27 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  lapic.h - Local APIC definitions.
+ */
+
+#pragma once
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#define LAPIC_ID  0x20
+#define LAPIC_SVR 0xF0
+#define LAPIC_EOI 0xB0
+
+#define LAPIC_ICDESTSHIFT 24
+
+typedef struct {
+    uint8_t vec;
+    bool swenabled;
+} lapic_svr_entry;
+
+void lapic_init();
+void lapic_eoi();
+void lapic_ipi(uint32_t id, uint8_t dat);
+uint32_t lapic_get_id();
\ No newline at end of file
diff --git a/kernel/src/arch/x86_64/pit.c b/kernel/src/arch/x86_64/pit.c
new file mode 100755
index 0000000..c1a804b
--- /dev/null
+++ b/kernel/src/arch/x86_64/pit.c
@@ -0,0 +1,31 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  pit.c - x86_64 Programmable Interval Timer implementation.
+ */
+#if defined(__x86_64__)
+
+#include <arch/x86_64/io.h>
+#include <arch/x86_64/idt.h>
+#include <dev/lapic.h>
+#include <lib/log.h>
+
+void pit_handler(registers_t *reg) {
+    //trace("pit: Interrupt from %d!\n", lapic_get_id());
+}
+
+void cpu_init_timer() {
+    outb(0x43, 0x36);
+
+    uint16_t div = (uint16_t)(1193180 / 1000);
+
+    // Since the PIT uses 8-bit IO operations,
+    // we need to split div in 2.
+    outb(0x40, (uint8_t)div);
+    outb(0x40, (uint8_t)(div >> 8));
+
+    idt_register_handler(0, pit_handler);
+}
+
+#endif
\ No newline at end of file
diff --git a/kernel/src/arch/x86_64/smp.c b/kernel/src/arch/x86_64/smp.c
new file mode 100755
index 0000000..7e92c8a
--- /dev/null
+++ b/kernel/src/arch/x86_64/smp.c
@@ -0,0 +1,25 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  smp.c - x86_64 Symetric Multiprocessing implementation
+ */
+
+#include "arch/cpu.h"
+#include <boot/limine.h>
+#include <deps/limine.h>
+#include <lib/log.h>
+#include <stdint.h>
+
+uint32_t bootstrap_lapic_id;
+
+// TODO: initialize the CPUs
+
+void cpu_init_smp() {
+    struct limine_mp_response *smp = limine_get_smp();
+    bootstrap_lapic_id = smp->bsp_lapic_id;
+
+    /*for (uint64_t i = 0; i < smp->cpu_count; i++) {
+        trace("smp: Starting CPU %d\n", i);
+    }*/
+}
diff --git a/kernel/src/arch/x86_64/smp.h b/kernel/src/arch/x86_64/smp.h
new file mode 100755
index 0000000..06c3422
--- /dev/null
+++ b/kernel/src/arch/x86_64/smp.h
@@ -0,0 +1,12 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  smp.c - x86_64 Symetric Multiprocessing definitions
+ */
+
+ #pragma once
+
+#include <stdint.h>
+
+extern uint32_t bootstrap_lapic_id;
\ No newline at end of file
diff --git a/kernel/src/boot/limine.c b/kernel/src/boot/limine.c
new file mode 100755
index 0000000..df2c24a
--- /dev/null
+++ b/kernel/src/boot/limine.c
@@ -0,0 +1,126 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  limine.c - Limine bootloader interface implementation.
+ */
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <boot/limine.h>
+#include <deps/limine.h>
+#include <proc/exec/elf.h>
+
+__attribute__((used, section(".limine_requests")))
+static volatile LIMINE_BASE_REVISION(3);
+
+__attribute__((used, section(".limine_requests")))
+static volatile struct limine_framebuffer_request framebuffer_request = {
+    .id = LIMINE_FRAMEBUFFER_REQUEST,
+    .revision = 0
+};
+
+__attribute__((used, section(".limine_requests")))
+static volatile struct limine_bootloader_info_request bl_info_request = {
+    .id = LIMINE_BOOTLOADER_INFO_REQUEST,
+    .revision = 0
+};
+
+__attribute__((used, section(".limine_requests")))
+static volatile struct limine_firmware_type_request firmware_type_req = {
+    .id = LIMINE_FIRMWARE_TYPE_REQUEST,
+    .revision = 0
+};
+
+__attribute__((used, section(".limine_requests")))
+static volatile struct limine_memmap_request memmap_req = {
+    .id = LIMINE_MEMMAP_REQUEST,
+    .revision = 0
+};
+
+__attribute__((used, section(".limine_requests")))
+static volatile struct limine_hhdm_request hhdm_req = {
+    .id = LIMINE_HHDM_REQUEST,
+    .revision = 0
+};
+
+__attribute__((used, section(".limine_requests")))
+static volatile struct limine_executable_address_request kaddr_req = {
+    .id = LIMINE_EXECUTABLE_ADDRESS_REQUEST,
+    .revision = 0
+};
+
+__attribute__((used, section(".limine_requests")))
+static volatile struct limine_executable_file_request execfile_req = {
+    .id = LIMINE_EXECUTABLE_FILE_REQUEST,
+    .revision = 0
+};
+
+__attribute__((used, section(".limine_requests")))
+static volatile struct limine_paging_mode_request pgmode_req = {
+    .id = LIMINE_PAGING_MODE_REQUEST,
+    .mode = LIMINE_PAGING_MODE_X86_64_4LVL,
+    .revision = 0
+};
+
+__attribute__((used, section(".limine_requests")))
+static volatile struct limine_rsdp_request rsdp_req = {
+    .id = LIMINE_RSDP_REQUEST,
+    .revision = 0
+};
+
+__attribute__((used, section(".limine_requests")))
+static volatile struct limine_mp_request smp_req = {
+    .id = LIMINE_MP_REQUEST,
+    .revision = 0
+};
+
+__attribute__((used, section(".limine_requests_start")))
+static volatile LIMINE_REQUESTS_START_MARKER;
+
+__attribute__((used, section(".limine_requests_end")))
+static volatile LIMINE_REQUESTS_END_MARKER;
+
+
+static limine_bootinfo_t __limine_bootinfo;
+
+
+bool limine_ensure_baserev() { return LIMINE_BASE_REVISION_SUPPORTED; }
+
+limine_fb_t *limine_get_fb(int id) {
+    if (!framebuffer_request.response)
+        return NULL;
+
+    if (id >= (int32_t)framebuffer_request.response->framebuffer_count) // Limine, WHY putting the FB count as a 64-bit integer??? I never seen someone with 0xFFFFFFFFFFFFFFFF screens
+        return NULL;
+    return framebuffer_request.response->framebuffers[id];
+}
+
+struct limine_memmap_response *limine_get_memmap() {
+    return memmap_req.response;
+}
+
+limine_bootinfo_t *limine_get_bootinfo() {
+    __limine_bootinfo.bl_name = bl_info_request.response->name;
+    __limine_bootinfo.bl_ver = bl_info_request.response->version;
+    __limine_bootinfo.fw_type = firmware_type_req.response->firmware_type;
+
+#if defined(__x86_64__)
+    __limine_bootinfo.arch = "x86_64";
+#elif defined(__aarch64__)
+    __limine_bootinfo.arch = "aarch64";
+#elif defined(__riscv)
+    __limine_bootinfo.arch = "riscv";
+#elif defined(__loongarch64)
+    __limine_bootinfo.arch = "loongarch64";
+#endif
+
+    return &__limine_bootinfo;
+}
+
+uint64_t limine_get_hhdm_offset() { return hhdm_req.response->offset; }
+uint64_t limine_get_kernel_vaddr() { return kaddr_req.response->virtual_base; }
+uint64_t limine_get_kernel_paddr() { return kaddr_req.response->physical_base; }
+uint64_t limine_get_kernel_ehdr_addr() { return (uint64_t)execfile_req.response->executable_file->address; }
+uint64_t limine_get_rsdp() { return rsdp_req.response->address + limine_get_hhdm_offset(); }
+struct limine_mp_response *limine_get_smp() { return smp_req.response; }
\ No newline at end of file
diff --git a/kernel/src/boot/limine.h b/kernel/src/boot/limine.h
new file mode 100755
index 0000000..4c5522d
--- /dev/null
+++ b/kernel/src/boot/limine.h
@@ -0,0 +1,39 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  limine.h - Limine bootloader interface declarations.
+ */
+
+#pragma once
+
+#include <deps/limine.h>
+#include <stdbool.h>
+
+typedef struct limine_framebuffer limine_fb_t;
+
+typedef struct {
+    char *bl_name;
+    char *bl_ver;
+    char *arch;
+    int fw_type;
+} limine_bootinfo_t;
+
+// Ensure that the used boot loader supports the kernel's LBP revision
+bool limine_ensure_baserev();
+
+// Get a framebuffer
+limine_fb_t *limine_get_fb(int id);
+
+// Get some informations about how the kernel was booted
+limine_bootinfo_t *limine_get_bootinfo();
+
+// Get the memory map.
+struct limine_memmap_response *limine_get_memmap();
+
+uint64_t limine_get_hhdm_offset();
+uint64_t limine_get_kernel_vaddr();
+uint64_t limine_get_kernel_paddr();
+uint64_t limine_get_kernel_ehdr_addr();
+uint64_t limine_get_rsdp();
+struct limine_mp_response *limine_get_smp();
\ No newline at end of file
diff --git a/kernel/src/config.h b/kernel/src/config.h
new file mode 100755
index 0000000..38af8b2
--- /dev/null
+++ b/kernel/src/config.h
@@ -0,0 +1,11 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  config.h - Kernel configuration definitions.
+ */
+
+#pragma once
+
+#define KERNEL_NAME "Soaplin"
+#define KERNEL_VER "0.0.1"
\ No newline at end of file
diff --git a/kernel/src/dev/tty.c b/kernel/src/dev/tty.c
new file mode 100755
index 0000000..9d64dd3
--- /dev/null
+++ b/kernel/src/dev/tty.c
@@ -0,0 +1,53 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  tty.c - Terminal interface implementation.
+ */
+
+#include <stdarg.h>
+#include <deps/flanterm/backends/fb.h>
+#include <deps/flanterm/flanterm.h>
+#include <boot/limine.h>
+#include <deps/npf.h>
+#include <lib/string.h>
+
+struct flanterm_context *tty0_ctx; 
+
+void tty_init() {
+    limine_fb_t *fb0 = limine_get_fb(0);
+
+    tty0_ctx = flanterm_fb_init(
+            NULL,
+            NULL,
+            fb0->address, fb0->width, fb0->height, fb0->pitch,
+            fb0->red_mask_size, fb0->red_mask_shift,
+            fb0->green_mask_size, fb0->green_mask_shift,
+            fb0->blue_mask_size, fb0->blue_mask_shift,
+            NULL,
+            NULL, NULL,
+            NULL, NULL,
+            NULL, NULL,
+            NULL, 0, 0, 1,
+            0, 0,
+            0
+    );
+}
+
+void tty_putc(char c) {
+    flanterm_write(tty0_ctx, &c, 1);
+}
+
+void tty_puts(char *str) {
+    flanterm_write(tty0_ctx, str, strlen(str));
+}
+
+void tty_printf(char *fmt, ...) {
+    char buf[2048];
+    va_list l;
+    va_start(l, fmt);
+    npf_vsnprintf(buf, 2048, fmt, l);
+    va_end(l);
+
+    tty_puts(buf);
+}
\ No newline at end of file
diff --git a/kernel/src/dev/tty.h b/kernel/src/dev/tty.h
new file mode 100755
index 0000000..03b838c
--- /dev/null
+++ b/kernel/src/dev/tty.h
@@ -0,0 +1,13 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  tty.h - Terminal interface declarations.
+ */
+
+#pragma once
+
+void tty_init();
+void tty_putc(char c);
+void tty_puts(char *str);
+void tty_printf(char *fmt, ...);
\ No newline at end of file
diff --git a/kernel/src/exec/elf.c b/kernel/src/exec/elf.c
deleted file mode 100644
index 5cd8d9c..0000000
--- a/kernel/src/exec/elf.c
+++ /dev/null
@@ -1,127 +0,0 @@
-#include "exec/exec.h"
-#include "mm/memop.h"
-#include "mm/pmm.h"
-#include "mm/vmm.h"
-#include <exec/elf.h>
-#include <mm/liballoc/liballoc.h>
-#include <stdint.h>
-#include <sys/log.h>
-
-program_t *elf_load(char *data, int user) {
-  Elf64_Ehdr *ehdr = (Elf64_Ehdr *)data;
-  if (ehdr->e_ident[EI_MAG0] != ELFMAG0 || ehdr->e_ident[EI_MAG1] != ELFMAG1 ||
-      ehdr->e_ident[EI_MAG2] != ELFMAG2 || ehdr->e_ident[EI_MAG3] != ELFMAG3) {
-    log("elf - loading failed: magic is incorrect\n");
-    return NULL;
-  }
-
-  log("elf - e_ident[EI_DATA]: %d\n", ehdr->e_ident[EI_DATA]);
-  log("elf - e_ident[EI_CLASS]: %d\n", ehdr->e_ident[EI_CLASS]);
-  log("elf - e_ident[EI_OSABI]: %d\n", ehdr->e_ident[EI_OSABI]);
-  log("elf - e_machine: %d\n", ehdr->e_machine);
-  log("elf - e_entry: %p\n", ehdr->e_entry);
-  log("elf - e_type: %p\n", ehdr->e_type);
-  log("elf - e_phnum: %p\n", ehdr->e_phnum);
-
-  if (ehdr->e_ident[EI_CLASS] != ELFCLASS64 || ehdr->e_machine != EM_X86_64) {
-    log("elf - loading failed: is the file built for amd64?\n");
-    return NULL;
-  }
-
-  if (ehdr->e_type != ET_EXEC) {
-    log("elf - loading failed: ELF type isn't ET_EXEC\n");
-    return NULL;
-  }
-
-  // There's the interesing part
-  elf_program_t *ret =
-      malloc(sizeof(elf_program_t)); // Allocate memory for the program.
-
-  pagemap_t *pm = vmm_alloc_pm(); // Allocate a pagemap, so that we can map the
-                                  // program inside.
-  ret->program.pm = pm;
-  ret->program.entry = ehdr->e_entry;
-  ret->ehdr = ehdr;
-
-  Elf64_Phdr *phdr = (Elf64_Phdr *)((uint8_t *)data + ehdr->e_phoff);
-
-  for (uint16_t i = 0; i < ehdr->e_phnum; i++) {
-    log("elf - ELF segment type: %d\n", phdr[i].p_type);
-    if (phdr[i].p_type != PT_LOAD)
-      continue;
-
-    uint64_t vaddr_start = ALIGN_DOWN(phdr[i].p_vaddr, PMM_PAGE_SIZE);
-    uint64_t vaddr_end =
-        ALIGN_UP(phdr[i].p_vaddr + phdr[i].p_memsz, PMM_PAGE_SIZE);
-    uint64_t offset = phdr[i].p_offset;
-
-    uint64_t flags = VMM_PRESENT;
-    if (phdr[i].p_flags & PF_W)
-      flags |= VMM_WRITABLE;
-    if (!(phdr[i].p_flags & PF_X))
-      flags |= VMM_NX;
-
-    if (user)
-      flags |= VMM_USER;
-
-    log("elf - loading ELF program header %u: vaddr 0x%llx - 0x%llx, offset "
-        "0x%llx, filesz 0x%llx, size 0x%llx, flags 0x%llx\n",
-        i, vaddr_start, vaddr_end, offset, phdr[i].p_filesz, phdr[i].p_memsz,
-        flags);
-
-    uint64_t page_offset = phdr[i].p_vaddr & (PMM_PAGE_SIZE - 1);
-
-    for (uint64_t vaddr = vaddr_start; vaddr < vaddr_end;
-         vaddr += PMM_PAGE_SIZE) {
-      uint64_t phys = (uint64_t)pmm_request_page();
-      if (!phys) {
-        log("elf - pmm page alloc failed. out of memory?\n");
-        return 0;
-      }
-
-      if (user) {
-        log("elf - vmm_map_user(%p, %p, %p, %d)\n", pm, vaddr, phys, flags);
-        vmm_map_user(pm, vaddr, phys, flags);
-      } else {
-        log("elf - vmm_map(%p, %p, %p, %d)\n", pm, vaddr, phys, flags);
-        vmm_map(pm, vaddr, phys, flags);
-      }
-      log("elf - memset(%p, 0, 0x1000)\n", HIGHER_HALF(phys));
-      memset((void *)HIGHER_HALF(phys), 0, PMM_PAGE_SIZE);
-
-      uint64_t file_page_offset = offset + (vaddr - vaddr_start);
-      uint64_t file_data_end = offset + phdr[i].p_filesz;
-
-      if (file_page_offset < file_data_end) {
-        uint64_t bytes_from_start = vaddr - vaddr_start;
-        uint64_t page_data_offset = 0;
-
-        if (bytes_from_start == 0 && page_offset > 0) {
-          page_data_offset = page_offset;
-        }
-
-        uint64_t copy_offset = file_page_offset;
-        uint64_t copy_size = PMM_PAGE_SIZE - page_data_offset;
-
-        if (copy_offset + copy_size > file_data_end) {
-          copy_size = file_data_end - copy_offset;
-        }
-
-        if (copy_size > 0) {
-          void *dest = (void *)(HIGHER_HALF(phys) + page_data_offset);
-          void *src = (uint8_t *)data + copy_offset;
-          log("elf - memcpy(%p, %p, %d)\n", dest, src, copy_size);
-          memcpy(dest, src, copy_size);
-
-          // log("elf - copied 0x%llx bytes from ELF file offset 0x%llx to vaddr
-          // 0x%llx (phys 0x%llx)\n",
-          //       copy_size, copy_offset, vaddr + page_data_offset, phys +
-          //       page_data_offset);
-        }
-      }
-    }
-  }
-
-  log("elf - loaded ELF program in memory.\n");
-  return (program_t *)ret;
-}
\ No newline at end of file
diff --git a/kernel/src/exec/exec.h b/kernel/src/exec/exec.h
deleted file mode 100644
index 2ac1776..0000000
--- a/kernel/src/exec/exec.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-/*
- * A program (or a script, if a shebang is found inside), literally.
- */
-#include "mm/vmm.h"
-
-#define EXEC_TYPE_ELF 0
-
-typedef struct {
-  // The path to the program/script that will be executed.
-  char *path;
-
-  // The pagemap where the program's code is loaded.
-  pagemap_t *pm;
-
-  // The path to the first instruction. This will be passed to the new process's
-  // rip register.
-  uint64_t entry;
-
-  // The program type. Used to get additional, unneeded information out of a
-  // program
-  int type;
-
-  // That is what Soaplin needs to know. Executable file loaders are encouraged
-  // to extend this structure to include info such as the EHDR for the ELF
-  // loader...
-} program_t;
\ No newline at end of file
diff --git a/kernel/src/font.c b/kernel/src/font.c
deleted file mode 100644
index 0c8c3ba..0000000
--- a/kernel/src/font.c
+++ /dev/null
@@ -1,343 +0,0 @@
-unsigned char VGA8[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x81, 0xa5, 0x81, 0x81, 0xbd,
-    0x99, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xff,
-    0xdb, 0xff, 0xff, 0xc3, 0xe7, 0xff, 0xff, 0x7e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x6c, 0xfe, 0xfe, 0xfe, 0xfe, 0x7c, 0x38, 0x10,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x7c, 0xfe,
-    0x7c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,
-    0x3c, 0x3c, 0xe7, 0xe7, 0xe7, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x18, 0x3c, 0x7e, 0xff, 0xff, 0x7e, 0x18, 0x18, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c,
-    0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xe7, 0xc3, 0xc3, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x42, 0x42, 0x66, 0x3c, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc3, 0x99, 0xbd,
-    0xbd, 0x99, 0xc3, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x1e, 0x0e,
-    0x1a, 0x32, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x7e, 0x18, 0x18,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x33, 0x3f, 0x30, 0x30, 0x30,
-    0x30, 0x70, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x63,
-    0x7f, 0x63, 0x63, 0x63, 0x63, 0x67, 0xe7, 0xe6, 0xc0, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x18, 0x18, 0xdb, 0x3c, 0xe7, 0x3c, 0xdb, 0x18, 0x18,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfe, 0xf8,
-    0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x0e,
-    0x1e, 0x3e, 0xfe, 0x3e, 0x1e, 0x0e, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
-    0x66, 0x00, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xdb,
-    0xdb, 0xdb, 0x7b, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x7c, 0xc6, 0x60, 0x38, 0x6c, 0xc6, 0xc6, 0x6c, 0x38, 0x0c, 0xc6,
-    0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xfe, 0xfe, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c,
-    0x7e, 0x18, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x7e, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x18, 0x0c, 0xfe, 0x0c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x60, 0xfe, 0x60, 0x30, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0,
-    0xc0, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x28, 0x6c, 0xfe, 0x6c, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x38, 0x7c, 0x7c, 0xfe, 0xfe, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0x7c, 0x7c,
-    0x38, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x18, 0x3c, 0x3c, 0x3c, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x24, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c,
-    0x6c, 0xfe, 0x6c, 0x6c, 0x6c, 0xfe, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00,
-    0x18, 0x18, 0x7c, 0xc6, 0xc2, 0xc0, 0x7c, 0x06, 0x06, 0x86, 0xc6, 0x7c,
-    0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc2, 0xc6, 0x0c, 0x18,
-    0x30, 0x60, 0xc6, 0x86, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c,
-    0x6c, 0x38, 0x76, 0xdc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x30, 0x30, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x18, 0x30, 0x30, 0x30, 0x30,
-    0x30, 0x30, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x18,
-    0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x3c, 0xff, 0x3c, 0x66, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e,
-    0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x02, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x38, 0x6c, 0xc6, 0xc6, 0xd6, 0xd6, 0xc6, 0xc6, 0x6c, 0x38,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x38, 0x78, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6,
-    0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x7c, 0xc6, 0x06, 0x06, 0x3c, 0x06, 0x06, 0x06, 0xc6, 0x7c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x1c, 0x3c, 0x6c, 0xcc, 0xfe,
-    0x0c, 0x0c, 0x0c, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc0,
-    0xc0, 0xc0, 0xfc, 0x06, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x38, 0x60, 0xc0, 0xc0, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc6, 0x06, 0x06, 0x0c, 0x18,
-    0x30, 0x30, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6,
-    0xc6, 0xc6, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x0c, 0x78,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00,
-    0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x18, 0x18, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x30, 0x18, 0x0c, 0x06,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00,
-    0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60,
-    0x30, 0x18, 0x0c, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x0c, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xde, 0xde,
-    0xde, 0xdc, 0xc0, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38,
-    0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x66, 0x66, 0x66, 0x66, 0xfc,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0,
-    0xc0, 0xc2, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x6c,
-    0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x60, 0x62, 0x66, 0xfe,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68,
-    0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66,
-    0xc2, 0xc0, 0xc0, 0xde, 0xc6, 0xc6, 0x66, 0x3a, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x0c,
-    0x0c, 0x0c, 0x0c, 0x0c, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0x66, 0xe6,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x60, 0x60,
-    0x60, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xee,
-    0xfe, 0xfe, 0xd6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0xc6,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
-    0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x66,
-    0x66, 0x66, 0x7c, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xd6, 0xde, 0x7c,
-    0x0c, 0x0e, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c,
-    0x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6,
-    0xc6, 0x60, 0x38, 0x0c, 0x06, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
-    0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6,
-    0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x6c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0xee, 0x6c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0x6c, 0x7c, 0x38, 0x38,
-    0x7c, 0x6c, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66,
-    0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xfe, 0xc6, 0x86, 0x0c, 0x18, 0x30, 0x60, 0xc2, 0xc6, 0xfe,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x30, 0x30, 0x30, 0x30, 0x30,
-    0x30, 0x30, 0x30, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-    0xc0, 0xe0, 0x70, 0x38, 0x1c, 0x0e, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00,
-    0x30, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0c, 0x7c,
-    0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x60,
-    0x60, 0x78, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc,
-    0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x38, 0x6c, 0x64, 0x60, 0xf0, 0x60, 0x60, 0x60, 0x60, 0xf0,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xcc, 0xcc,
-    0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0xcc, 0x78, 0x00, 0x00, 0x00, 0xe0, 0x60,
-    0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x18, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x00, 0x0e, 0x06, 0x06,
-    0x06, 0x06, 0x06, 0x06, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0xe0, 0x60,
-    0x60, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0xfe, 0xd6,
-    0xd6, 0xd6, 0xd6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66,
-    0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0x0c, 0x1e, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0xf0,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x60,
-    0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x30,
-    0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66,
-    0x66, 0x66, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x6c, 0x38, 0x38, 0x38, 0x6c, 0xc6,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6,
-    0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xfe, 0xcc, 0x18, 0x30, 0x60, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x0e, 0x18, 0x18, 0x18, 0x70, 0x18, 0x18, 0x18, 0x18, 0x0e,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x00, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x18,
-    0x18, 0x18, 0x0e, 0x18, 0x18, 0x18, 0x18, 0x70, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6,
-    0xc6, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66,
-    0xc2, 0xc0, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x0c, 0x06, 0x7c, 0x00, 0x00,
-    0x00, 0x00, 0xcc, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x18, 0x30, 0x00, 0x7c, 0xc6, 0xfe,
-    0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c,
-    0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xcc, 0x00, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x30, 0x18, 0x00, 0x78, 0x0c, 0x7c,
-    0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x38,
-    0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x60, 0x60, 0x66, 0x3c, 0x0c, 0x06,
-    0x3c, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xfe,
-    0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x00,
-    0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x60, 0x30, 0x18, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x38, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c, 0x66,
-    0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x60, 0x30, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6,
-    0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x38, 0x00,
-    0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00,
-    0x18, 0x30, 0x60, 0x00, 0xfe, 0x66, 0x60, 0x7c, 0x60, 0x60, 0x66, 0xfe,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0x76, 0x36,
-    0x7e, 0xd8, 0xd8, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x6c,
-    0xcc, 0xcc, 0xfe, 0xcc, 0xcc, 0xcc, 0xcc, 0xce, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x10, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x00, 0x00, 0x7c, 0xc6, 0xc6,
-    0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x30, 0x18,
-    0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x30, 0x78, 0xcc, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x30, 0x18, 0x00, 0xcc, 0xcc, 0xcc,
-    0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x00,
-    0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0x78, 0x00,
-    0x00, 0xc6, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
-    0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x3c,
-    0x66, 0x60, 0x60, 0x60, 0x66, 0x3c, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x38, 0x6c, 0x64, 0x60, 0xf0, 0x60, 0x60, 0x60, 0x60, 0xe6, 0xfc,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x3c, 0x18, 0x7e, 0x18,
-    0x7e, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xcc, 0xcc,
-    0xf8, 0xc4, 0xcc, 0xde, 0xcc, 0xcc, 0xcc, 0xc6, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x0e, 0x1b, 0x18, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0xd8, 0x70, 0x00, 0x00, 0x00, 0x18, 0x30, 0x60, 0x00, 0x78, 0x0c, 0x7c,
-    0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x18, 0x30,
-    0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x18, 0x30, 0x60, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x60, 0x00, 0xcc, 0xcc, 0xcc,
-    0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc,
-    0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00,
-    0x76, 0xdc, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x6c, 0x6c, 0x3e, 0x00, 0x7e, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x6c,
-    0x38, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x30, 0x30, 0x00, 0x30, 0x30, 0x60, 0xc0, 0xc6, 0xc6, 0x7c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc0,
-    0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xfe, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xc0, 0xc0, 0xc2, 0xc6, 0xcc, 0x18, 0x30, 0x60, 0xdc, 0x86, 0x0c,
-    0x18, 0x3e, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc2, 0xc6, 0xcc, 0x18, 0x30,
-    0x66, 0xce, 0x9e, 0x3e, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18,
-    0x00, 0x18, 0x18, 0x18, 0x3c, 0x3c, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x6c, 0xd8, 0x6c, 0x36, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x6c, 0x36,
-    0x6c, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x44, 0x11, 0x44,
-    0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, 0x44,
-    0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa,
-    0x55, 0xaa, 0x55, 0xaa, 0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77,
-    0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0xf8,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0xf6, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x18, 0xf8,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0xf6, 0x06, 0xf6, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x06, 0xf6,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0xf6, 0x06, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xfe, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0xf8,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x1f, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x37,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x37, 0x30, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x30, 0x37, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xf7, 0x00, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xff, 0x00, 0xf7, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x37, 0x30, 0x37, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0xf7, 0x00, 0xf7, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xff, 0x00, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x1f, 0x18, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x18, 0x1f, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0xff, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x18, 0xff, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xf0, 0xf0, 0xf0,
-    0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x0f, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x76, 0xdc, 0xd8, 0xd8, 0xd8, 0xdc, 0x76, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x78, 0xcc, 0xcc, 0xcc, 0xd8, 0xcc, 0xc6, 0xc6, 0xc6, 0xcc,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc6, 0xc6, 0xc0, 0xc0, 0xc0,
-    0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xfe, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0xfe, 0xc6, 0x60, 0x30, 0x18, 0x30, 0x60, 0xc6, 0xfe,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xd8, 0xd8,
-    0xd8, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x66, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0xc0, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x18, 0x3c, 0x66, 0x66,
-    0x66, 0x3c, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38,
-    0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x38, 0x6c, 0xc6, 0xc6, 0xc6, 0x6c, 0x6c, 0x6c, 0x6c, 0xee,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x30, 0x18, 0x0c, 0x3e, 0x66,
-    0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x7e, 0xdb, 0xdb, 0xdb, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x03, 0x06, 0x7e, 0xdb, 0xdb, 0xf3, 0x7e, 0x60, 0xc0,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x30, 0x60, 0x60, 0x7c, 0x60,
-    0x60, 0x60, 0x30, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c,
-    0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e, 0x18,
-    0x18, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30,
-    0x18, 0x0c, 0x06, 0x0c, 0x18, 0x30, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x0c, 0x18, 0x30, 0x60, 0x30, 0x18, 0x0c, 0x00, 0x7e,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x1b, 0x1b, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0xd8, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x7e, 0x00, 0x18, 0x18, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00,
-    0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x6c,
-    0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0c, 0x0c,
-    0x0c, 0x0c, 0x0c, 0xec, 0x6c, 0x6c, 0x3c, 0x1c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xd8, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xd8, 0x30, 0x60, 0xc8, 0xf8, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00};
\ No newline at end of file
diff --git a/kernel/src/font.h b/kernel/src/font.h
deleted file mode 100755
index 2ab685a..0000000
--- a/kernel/src/font.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-extern unsigned char VGA8[];
\ No newline at end of file
diff --git a/kernel/src/fs/vfs.h b/kernel/src/fs/vfs.h
old mode 100644
new mode 100755
index bbaa364..6beb202
--- a/kernel/src/fs/vfs.h
+++ b/kernel/src/fs/vfs.h
@@ -1,28 +1,45 @@
 #pragma once
 
-// btw fuck sun
-
+#include <stddef.h>
 #include <stdint.h>
 
-#define VNODE_TYPE_FILE 0
-#define VNODE_TYPE_DIR 1
-#define VNODE_TYPE_DEV 2
+struct vnode;
 
-typedef struct __vnode {
-  char name[128];
-  int type;
+#define VN_FILE 1
+#define VN_DIR 2
 
-  struct __vnode *children;
-  struct __vnode *next;
-  struct __vnode *parent;
+typedef uint32_t vnode_type_t;
 
-  void (*write)(void *buffer, uint64_t off, uint64_t size);
-  void (*read)(void *buffer, uint64_t off, uint64_t size);
-} vnode;
+typedef struct vnode_ops {
+  int (*read)(struct vnode *vn, void *buf, size_t off, size_t size);
+  int (*lookup)(struct vnode *vn, const char *name, struct vnode **out);
+} vnode_ops_t;
 
-typedef struct __vfs_mount {
-  struct vfs_node
-      *mount_point; // The directory in the main VFS where this is mounted
-  struct vfs_node *mounted_root; // The root node of the mounted filesystem
-  struct vfs_mount *next;        // Pointer to next mount point
-} vfs_mount;
+typedef struct vnode {
+  char name[256];
+  vnode_type_t type;
+  uint32_t refcount;
+  struct vnode* parent; // If this vnode exists, then it's parent too.
+  
+  struct vnode_ops *ops;
+  void *internal;
+} vnode_t;
+
+typedef struct mountpoint {
+  char name[32];
+  struct fs *fs;
+  vnode_t *mountpoint;
+} mountpoint_t;
+
+typedef struct fs {
+  char name[32];
+  struct vnode *root;
+  int (*mount)(struct fs *fs, struct vnode *mountpoint);
+} fs_t;
+
+void vfs_init(void);
+int vfs_mount(char *path, fs_t *fs);
+int vfs_unmount(char *path);
+int vfs_open(vnode_t *curdir, const char *path, vnode_t **out);
+int vfs_read(vnode_t *vn, void *buf, size_t off, size_t size);
+vnode_t *vfs_create_node(char *name, vnode_type_t type);
\ No newline at end of file
diff --git a/kernel/src/lib/ansi.c b/kernel/src/lib/ansi.c
new file mode 100755
index 0000000..0eb8c87
--- /dev/null
+++ b/kernel/src/lib/ansi.c
@@ -0,0 +1,29 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  ansi.c - ANSI escape sequence generation functions implementation.
+ */
+
+#include <deps/npf.h>
+#include <lib/ansi.h>
+#include <stdint.h>
+
+static char __ansi_bg_buf[32];
+static char __ansi_fg_buf[32];
+
+char *ansi_gen_bg(uint8_t r, uint8_t g, uint8_t b) {
+    int len = npf_snprintf(__ansi_bg_buf, sizeof(__ansi_bg_buf), "\033[48;2;%d;%d;%d;m", r, g, b);
+    if (len < 0 || len >= (int)sizeof(__ansi_bg_buf)) {
+        return "\033[0m";
+    }
+    return __ansi_bg_buf;
+}
+
+char *ansi_gen_fg(uint8_t r, uint8_t g, uint8_t b) {
+    int len = npf_snprintf(__ansi_fg_buf, sizeof(__ansi_fg_buf), "\033[38;2;%d;%d;%d;m", r, g, b);
+    if (len < 0 || len >= (int)sizeof(__ansi_fg_buf)) {
+        return "\033[0m";
+    }
+    return __ansi_fg_buf;
+}
\ No newline at end of file
diff --git a/kernel/src/lib/ansi.h b/kernel/src/lib/ansi.h
new file mode 100755
index 0000000..2036e2e
--- /dev/null
+++ b/kernel/src/lib/ansi.h
@@ -0,0 +1,15 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  ansi.h - ANSI escape sequence generation functions.
+ */
+
+#pragma once
+#include <stdint.h>
+
+#define ANSI_CLEAR_SCREEN "\033[H\033[2J"
+#define ANSI_RESET_COLOR  "\033[39m\\033[49m"
+
+char *ansi_gen_bg(uint8_t r, uint8_t g, uint8_t b);
+char *ansi_gen_fg(uint8_t r, uint8_t g, uint8_t b);
\ No newline at end of file
diff --git a/kernel/src/lib/gcc.c b/kernel/src/lib/gcc.c
deleted file mode 100644
index 197ca84..0000000
--- a/kernel/src/lib/gcc.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdint.h>
-/*int __eqdf2(double a, double b) {
-    union { double f; uint64_t i; } ua = { a }, ub = { b };
-    return ua.i == ub.i;
-}
-int __ltdf2(double a, double b) {
-    if (a < b) return -1;
-    if (a > b) return 1;
-    return 0;
-}
-double __truncxfdf2(double x) {
-    return (double)x;
-}
-int __gtdf2(double a, double b) {
-    if (a > b) return 1;
-    if (a < b) return -1;
-    return 0;
-}**/
diff --git a/kernel/src/lib/log.c b/kernel/src/lib/log.c
new file mode 100755
index 0000000..7baa324
--- /dev/null
+++ b/kernel/src/lib/log.c
@@ -0,0 +1,57 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  log.c - Kernel logging interface.
+ */
+#include <stdarg.h>
+#include <lib/log.h>
+#include <lib/spinlock.h>
+
+static int __logger_max_loglevel = 0;
+static log_output_func __logger_outputs[16];
+static int __logger_output_count = 0;
+static spinlock_t __logger_lock;
+
+static char* prelog[7] = {
+    "\033[38;2;169;68;66;mFAULT  | \033[39m",
+    "\033[38;2;217;83;79;mERROR  | \033[39m",
+    "\033[38;2;240;173;78;mWARN   | \033[39m",
+    "\033[38;2;240;240;240;mNOTICE | \033[39m",
+    "\033[38;2;92;184;92;mINFO   | \033[39m",
+    "\033[38;2;87;201;193;mDEBUG  | \033[39m",
+    "\033[38;2;150;150;150;mTRACE  | \033[39m",
+};
+
+void log_init(int max_loglevel) {
+    __logger_max_loglevel = max_loglevel;
+}
+
+bool log_register_output(log_output_func fn) {
+    if (fn && __logger_output_count <= 16) {
+        __logger_output_count ++;
+        __logger_outputs[__logger_output_count - 1] = fn;
+        return true;
+    }
+    return false;
+}
+
+void log(int loglevel, char *str, ...) {
+    if (__logger_max_loglevel == 0 || __logger_output_count == 0)
+        return; // The user forgot to initialize the logger.
+
+    if (loglevel > __logger_max_loglevel)
+        return; // The user does not want this type of log to show up.
+
+    sl_acquire(&__logger_lock);
+    va_list vl;
+    va_start(vl, str);
+
+    for (int i = 0; i < __logger_output_count; i++) {
+        __logger_outputs[i](prelog[loglevel - 1], (void*)0);
+        __logger_outputs[i](str, &vl);
+    }
+
+    va_end(vl);
+    sl_release(&__logger_lock);
+}
\ No newline at end of file
diff --git a/kernel/src/lib/log.h b/kernel/src/lib/log.h
new file mode 100755
index 0000000..6c47f8e
--- /dev/null
+++ b/kernel/src/lib/log.h
@@ -0,0 +1,35 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  log.h - Kernel logging interface.
+ */
+
+#pragma once
+
+// Log levels in order of increasing severity
+#include <stdarg.h>
+#include <stdbool.h>
+
+#define LOGLEVEL_TRACE    7
+#define LOGLEVEL_DEBUG    6
+#define LOGLEVEL_INFO     5
+#define LOGLEVEL_NOTICE   4
+#define LOGLEVEL_WARNING  3
+#define LOGLEVEL_ERROR    2
+#define LOGLEVEL_FATAL    1
+
+typedef void(*log_output_func)(char *str, va_list *vl);
+
+void log_init(int max_loglevel);
+bool log_register_output(log_output_func fn);
+void log(int loglevel, char *str, ...);
+
+// Shortcuts to log
+#define trace(str, ...)   log(LOGLEVEL_TRACE,  str, ##__VA_ARGS__)
+#define debug(str, ...)   log(LOGLEVEL_DEBUG,  str, ##__VA_ARGS__)
+#define info(str, ...)    log(LOGLEVEL_INFO,   str, ##__VA_ARGS__)
+#define notice(str, ...)  log(LOGLEVEL_NOTICE, str, ##__VA_ARGS__)
+#define warn(str, ...)    log(LOGLEVEL_WARNING, str, ##__VA_ARGS__)
+#define error(str, ...)   log(LOGLEVEL_ERROR,  str, ##__VA_ARGS__)
+#define fatal(str, ...)   log(LOGLEVEL_FATAL,  str, ##__VA_ARGS__)
\ No newline at end of file
diff --git a/kernel/src/lib/logoutputs_sk.c b/kernel/src/lib/logoutputs_sk.c
new file mode 100755
index 0000000..4276d48
--- /dev/null
+++ b/kernel/src/lib/logoutputs_sk.c
@@ -0,0 +1,26 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  logoutputs_sk.c - Output functions for the logger
+ */
+#include "deps/npf.h"
+#include <dev/tty.h>
+#include <lib/logoutputs_sk.h>
+
+void sklogoutput_tty(char *str, va_list *vl) {
+    if (!vl) {
+        tty_puts(str);
+        return;
+    }
+
+    char buf[2048];
+    npf_vsnprintf(buf, 2048, str, *vl);
+    tty_puts(buf);
+}
+
+void sklogoutput_e9(char *str, va_list *vl) {
+    // TODO: implement this
+    (void)str;
+    (void)vl;
+}
\ No newline at end of file
diff --git a/kernel/src/lib/logoutputs_sk.h b/kernel/src/lib/logoutputs_sk.h
new file mode 100755
index 0000000..bb51ff0
--- /dev/null
+++ b/kernel/src/lib/logoutputs_sk.h
@@ -0,0 +1,16 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  logoutputs_sk.h - Output functions for the logger
+ */
+
+#pragma once
+
+// Output to the terminal.
+#include <stdarg.h>
+
+void sklogoutput_tty(char *str, va_list *vl);
+
+// Output to QEMU & Bochs's E9 port.
+void sklogoutput_e9(char *str, va_list *vl);
\ No newline at end of file
diff --git a/kernel/src/lib/npf.c b/kernel/src/lib/npf.c
new file mode 100755
index 0000000..6669543
--- /dev/null
+++ b/kernel/src/lib/npf.c
@@ -0,0 +1,18 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  npf.c - nanoprintf configuration and implementation.
+ */
+
+#define NANOPRINTF_USE_FIELD_WIDTH_FORMAT_SPECIFIERS 1
+#define NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS 1
+#define NANOPRINTF_USE_LARGE_FORMAT_SPECIFIERS 1
+#define NANOPRINTF_USE_SMALL_FORMAT_SPECIFIERS 1
+#define NANOPRINTF_USE_FLOAT_FORMAT_SPECIFIERS 0
+#define NANOPRINTF_USE_BINARY_FORMAT_SPECIFIERS 1
+#define NANOPRINTF_USE_WRITEBACK_FORMAT_SPECIFIERS 0
+
+// Compile nanoprintf in this translation unit.
+#define NANOPRINTF_IMPLEMENTATION
+#include <deps/npf.h>
\ No newline at end of file
diff --git a/kernel/src/lib/spinlock.c b/kernel/src/lib/spinlock.c
new file mode 100755
index 0000000..88bc6c1
--- /dev/null
+++ b/kernel/src/lib/spinlock.c
@@ -0,0 +1,25 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  spinlock.c - Spinlock implementation.
+ */
+
+#include <lib/spinlock.h>
+
+void sl_acquire(spinlock_t volatile *plock)
+{
+    while (!__sync_bool_compare_and_swap(plock, 0, 1))
+    {
+        while (*plock)
+        {
+            asm("pause");
+        }
+    }
+}
+
+void sl_release(spinlock_t volatile *plock)
+{
+    __sync_lock_release(plock);
+}
+
diff --git a/kernel/src/lib/spinlock.h b/kernel/src/lib/spinlock.h
old mode 100644
new mode 100755
index 894ff5b..07c18cd
--- a/kernel/src/lib/spinlock.h
+++ b/kernel/src/lib/spinlock.h
@@ -1,17 +1,13 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  spinlock.h - Spinlock definitions.
+ */
+
 #pragma once
 
-#include <stdint.h>
+typedef unsigned int spinlock_t;
 
-typedef struct spinlock {
-  volatile int locked;
-} spinlock_t;
-
-inline void spinlock_acquire(spinlock_t *lock) {
-  while (__sync_lock_test_and_set(&(lock)->locked, 1))
-    while ((lock)->locked)
-      __asm__ volatile("pause");
-}
-
-inline void spinlock_release(spinlock_t *lock) {
-  __sync_lock_release(&(lock)->locked);
-}
\ No newline at end of file
+void sl_acquire(spinlock_t volatile *plock);
+void sl_release(spinlock_t volatile *plock);
\ No newline at end of file
diff --git a/kernel/src/lib/string.c b/kernel/src/lib/string.c
new file mode 100755
index 0000000..98652b5
--- /dev/null
+++ b/kernel/src/lib/string.c
@@ -0,0 +1,15 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  string.c - String manipulation functions implementation.
+ */
+
+#include <lib/string.h>
+
+size_t strlen(char *str) {
+    size_t i = 0;
+    while (str[i] != '\0')
+        i++;
+    return i;
+}
\ No newline at end of file
diff --git a/kernel/src/lib/string.h b/kernel/src/lib/string.h
new file mode 100755
index 0000000..b0d1424
--- /dev/null
+++ b/kernel/src/lib/string.h
@@ -0,0 +1,12 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  string.h - String manipulation functions.
+ */
+
+#pragma once
+
+#include <stddef.h>
+
+size_t strlen(char *str);
\ No newline at end of file
diff --git a/kernel/src/main.c b/kernel/src/main.c
old mode 100644
new mode 100755
index 9c27252..9d7b627
--- a/kernel/src/main.c
+++ b/kernel/src/main.c
@@ -1,145 +1,56 @@
-#include "exec/elf.h"
-#include "exec/exec.h"
-#include "mm/liballoc/liballoc.h"
-#include "mm/pmm.h"
-#include "mm/vma.h"
-#include "mm/vmm.h"
-#include "sched/sched.h"
-#include "sys/acpi.h"
-#include "sys/arch/x86_64/pit.h"
-#include "sys/arch/x86_64/sse.h"
-#include "sys/syscall.h"
-#include <font.h>
-#include <limine.h>
-#include <stdbool.h>
-#include <stddef.h>
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  main.c - Kernel entry point and initialization.
+ */
+
 #include <stdint.h>
-#include <sys/arch/x86_64/fpu.h>
-#include <sys/arch/x86_64/gdt.h>
-#include <sys/arch/x86_64/idt.h>
-#include <sys/gfx/flanterm/backends/fb.h>
-#include <sys/gfx/flanterm/flanterm.h>
-#include <sys/log.h>
-#include <sys/printf.h>
+#include <stddef.h>
+#include <stdbool.h>
 
-// Set the base revision to 3, this is recommended as this is the latest
-// base revision described by the Limine boot protocol specification.
-// See specification for further info.
+#include <acpi/acpi.h>
+#include <acpi/madt.h>
+#include <arch/cpu.h>
+#include <boot/limine.h>
+#include <config.h>
+#include <dev/tty.h>
+#include <lib/ansi.h>
+#include <lib/log.h>
+#include <lib/logoutputs_sk.h>
+#include <mm/memop.h>
+#include <mm/pmm.h>
+#include "arch/x86_64/smp.h"
+#include "mm/paging.h"
+#include "mm/vma.h"
 
-__attribute__((
-    used, section(".limine_requests"))) static volatile LIMINE_BASE_REVISION(3);
-
-// The Limine requests can be placed anywhere, but it is important that
-// the compiler does not optimise them away, so, usually, they should
-// be made volatile or equivalent, _and_ they should be accessed at least
-// once or marked as used with the "used" attribute as done here.
-
-__attribute__((
-    used,
-    section(
-        ".limine_requests"))) static volatile struct limine_framebuffer_request
-    framebuffer_request = {.id = LIMINE_FRAMEBUFFER_REQUEST, .revision = 0};
-
-__attribute__((
-    used,
-    section(".limine_requests"))) static volatile struct limine_module_request
-    module_request = {.id = LIMINE_MODULE_REQUEST, .revision = 0};
-
-/*__attribute__((used, section(".limine_requests")))
-static volatile struct limine_entry_point_request entrypoint_request = {
-    .id = LIMINE_ENTRY_POINT_REQUEST,
-    .revision = 3
-};*/
-// Finally, define the start and end markers for the Limine requests.
-// These can also be moved anywhere, to any .c file, as seen fit.
-
-__attribute__((used,
-               section(".limine_requests_"
-                       "start"))) static volatile LIMINE_REQUESTS_START_MARKER;
-
-__attribute__((
-    used,
-    section(
-        ".limine_requests_end"))) static volatile LIMINE_REQUESTS_END_MARKER;
-
-// Halt and catch fire function.
-static void hcf(void) {
-  for (;;) {
-#if defined(__x86_64__)
-    asm("hlt");
-#elif defined(__aarch64__) || defined(__riscv)
-    asm("wfi");
-#elif defined(__loongarch64)
-    asm("idle 0");
-#endif
-  }
-}
-
-struct limine_framebuffer *fb;
-struct flanterm_context *ft_ctx;
-uint32_t fg = 0xFFFFFF;
-
-char kstack[8192];
-
-// The following will be our kernel's entry point.
-// If renaming kmain() to something else, make sure to change the
-// linker script accordingly.
 void kmain(void) {
-  // Ensure the bootloader actually understands our base revision (see spec).
-  /*if (LIMINE_BASE_REVISION_SUPPORTED == false) {
-      hcf();
-  }*/
+    tty_init();
+    log_init(LOGLEVEL_TRACE);
+    log_register_output(sklogoutput_tty);
 
-  // Ensure we got a framebuffer.
-  if (framebuffer_request.response != NULL) {
+    limine_bootinfo_t *bi = limine_get_bootinfo();
+    info("%s %s-%s (booted using %s %s, with firmware type %d)\n", KERNEL_NAME, KERNEL_VER,
+        bi->arch, bi->bl_name, bi->bl_ver, bi->fw_type);
 
-    // Fetch the first framebuffer.
-    struct limine_framebuffer *framebuffer =
-        framebuffer_request.response->framebuffers[0];
-    fb = framebuffer;
+    arch_init_stage1();
 
-    ft_ctx = flanterm_fb_init(
-        NULL, NULL, framebuffer->address, framebuffer->width,
-        framebuffer->height, framebuffer->pitch, framebuffer->red_mask_size,
-        framebuffer->red_mask_shift, framebuffer->green_mask_size,
-        framebuffer->green_mask_shift, framebuffer->blue_mask_size,
-        framebuffer->blue_mask_shift, NULL, NULL, NULL, NULL, &fg, NULL, NULL,
-        VGA8, 8, 16, 0, 0, 0, 0);
-  }
+    pmm_init();
+    pg_init();
+    
+    acpi_init();
+    madt_init();
 
-  printf("\n  Soaplin 1.0-sild is booting up your computer...\n\n");
-  // printf("Physical kernel EP: %p", entrypoint_request.entry);
+    cpu_init_apic();
+    cpu_init_smp();
+    cpu_init_timer();
 
-  gdt_init(&kstack[8192]);
-  idt_init();
-  fpu_activate();
-  sse_init();
+    
+    cpu_enable_ints(1);
+    //lapic_ipi(bootstrap_lapic_id, 32);
 
-  pmm_init();
-  vmm_init();
-  kernel_vma_context = vma_create_context(vmm_kernel_pm);
-  if (!kernel_vma_context) {
-    log("kernel - vma ctx creation failed. halting\n");
-    asm("cli");
     while (1)
-      asm("hlt");
-  }
-
-  // acpi_init();
-  syscall_init();
-  pit_init(1000);
-  sched_init();
-  // user_init();
-
-  struct limine_file *f = module_request.response->modules[0];
-  log("kmain - %s\n", f->path);
-
-  program_t *prog = elf_load((char *)f->address, 1);
-
-  sched_create("Init", prog->entry, prog->pm, SCHED_USER_PROCESS);
-
-  log("kernel - Soaplin initialized sucessfully.\n");
-  while (1)
-    ;
-  ; //__asm__ volatile ("hlt");
+        ;;
+    // We're done, just hang... for now.
+    //hcf();
 }
diff --git a/kernel/src/mm/liballoc/liballoc.c b/kernel/src/mm/liballoc/liballoc.c
deleted file mode 100644
index 00d961a..0000000
--- a/kernel/src/mm/liballoc/liballoc.c
+++ /dev/null
@@ -1,586 +0,0 @@
-// Copyright: Durand Miller <clutter@djm.co.za>
-#include <mm/liballoc/liballoc.h>
-
-// very dirty way of disabling logging in liballoc
-#define log(...) (void)0
-
-#define VERSION "1.1"
-#define ALIGNMENT 16ul
-
-#define ALIGN_TYPE char
-#define ALIGN_INFO sizeof(ALIGN_TYPE) * 16
-
-#define USE_CASE1
-#define USE_CASE2
-#define USE_CASE3
-#define USE_CASE4
-#define USE_CASE5
-
-#define ALIGN(ptr)                                                             \
-  if (ALIGNMENT > 1) {                                                         \
-    uintptr_t diff;                                                            \
-    ptr = (void *)((uintptr_t)ptr + ALIGN_INFO);                               \
-    diff = (uintptr_t)ptr & (ALIGNMENT - 1);                                   \
-    if (diff != 0) {                                                           \
-      diff = ALIGNMENT - diff;                                                 \
-      ptr = (void *)((uintptr_t)ptr + diff);                                   \
-    }                                                                          \
-    *((ALIGN_TYPE *)((uintptr_t)ptr - ALIGN_INFO)) = diff + ALIGN_INFO;        \
-  }
-
-#define UNALIGN(ptr)                                                           \
-  if (ALIGNMENT > 1) {                                                         \
-    uintptr_t diff = *((ALIGN_TYPE *)((uintptr_t)ptr - ALIGN_INFO));           \
-    if (diff < (ALIGNMENT + ALIGN_INFO)) {                                     \
-      ptr = (void *)((uintptr_t)ptr - diff);                                   \
-    }                                                                          \
-  }
-
-#define LIBALLOC_MAGIC 0xc001c0de
-#define LIBALLOC_DEAD 0xdeaddead
-
-struct liballoc_major {
-  struct liballoc_major *prev;
-  struct liballoc_major *next;
-  unsigned int pages;
-  unsigned int size;
-  unsigned int usage;
-  struct liballoc_minor *first;
-};
-
-struct liballoc_minor {
-  struct liballoc_minor *prev;
-  struct liballoc_minor *next;
-  struct liballoc_major *block;
-  unsigned int magic;
-  unsigned int size;
-  unsigned int req_size;
-};
-
-static struct liballoc_major *l_memRoot = NULL;
-static struct liballoc_major *l_bestBet = NULL;
-
-static unsigned int l_pageSize = 4096;
-static unsigned int l_pageCount = 16;
-static unsigned long long l_allocated = 0;
-static unsigned long long l_inuse = 0;
-
-static long long l_warningCount = 0;
-static long long l_errorCount = 0;
-static long long l_possibleOverruns = 0;
-
-static void *liballoc_memset(void *s, int c, size_t n) {
-  unsigned int i;
-  for (i = 0; i < n; i++)
-    ((char *)s)[i] = c;
-
-  return s;
-}
-static void *liballoc_memcpy(void *s1, const void *s2, size_t n) {
-  char *cdest;
-  char *csrc;
-  unsigned int *ldest = (unsigned int *)s1;
-  unsigned int *lsrc = (unsigned int *)s2;
-
-  while (n >= sizeof(unsigned int)) {
-    *ldest++ = *lsrc++;
-    n -= sizeof(unsigned int);
-  }
-
-  cdest = (char *)ldest;
-  csrc = (char *)lsrc;
-
-  while (n > 0) {
-    *cdest++ = *csrc++;
-    n -= 1;
-  }
-
-  return s1;
-}
-
-#if _DEBUG
-void liballoc_dump() {
-#ifdef _DEBUG
-  struct liballoc_major *maj = l_memRoot;
-  struct liballoc_minor *min = NULL;
-#endif
-
-  info("------ Memory data ---------------");
-  info("System memory allocated: %i bytes", l_allocated);
-  info("Memory in used (malloc'ed): %i bytes", l_inuse);
-  info("Warning count: %i", l_warningCount);
-  info("Error count: %i", l_errorCount);
-  info("Possible overruns: %i", l_possibleOverruns);
-
-#ifdef _DEBUG
-  while (maj != NULL) {
-    info("%x: total = %i, used = %i", maj, maj->size, maj->usage);
-
-    min = maj->first;
-    while (min != NULL) {
-      info("   %x: %i bytes", min, min->size);
-      min = min->next;
-    }
-
-    maj = maj->next;
-  }
-#endif
-}
-#else
-void liballoc_dump() { return; }
-#endif
-
-static struct liballoc_major *allocate_new_page(unsigned int size) {
-  unsigned int st;
-  struct liballoc_major *maj;
-
-  st = size + sizeof(struct liballoc_major);
-  st += sizeof(struct liballoc_minor);
-
-  if ((st % l_pageSize) == 0)
-    st = st / (l_pageSize);
-  else
-    st = st / (l_pageSize) + 1;
-
-  if (st < l_pageCount)
-    st = l_pageCount;
-
-  maj = (struct liballoc_major *)liballoc_alloc(st);
-
-  if (maj == NULL) {
-    l_warningCount += 1;
-    log("liballoc - (warning) liballoc_alloc( %i ) return NULL", st);
-    return NULL;
-  }
-
-  maj->prev = NULL;
-  maj->next = NULL;
-  maj->pages = st;
-  maj->size = st * l_pageSize;
-  maj->usage = sizeof(struct liballoc_major);
-  maj->first = NULL;
-
-  l_allocated += maj->size;
-
-  log("liballoc - Resource allocated %x of %i pages (%i bytes) for %i size.",
-      maj, st, maj->size, size);
-  log("liballoc - Total memory usage = %i KB", (int)((l_allocated / (1024))));
-
-  return maj;
-}
-
-void *PREFIX(malloc)(size_t req_size) {
-  int startedBet = 0;
-  unsigned long long bestSize = 0;
-  void *p = NULL;
-  uintptr_t diff;
-  struct liballoc_major *maj;
-  struct liballoc_minor *min;
-  struct liballoc_minor *new_min;
-  unsigned long size = req_size;
-
-  if (ALIGNMENT > 1) {
-    size += ALIGNMENT + ALIGN_INFO;
-  }
-
-  liballoc_lock();
-
-  if (size == 0) {
-    l_warningCount += 1;
-    log("liballoc - (warning) alloc( 0 ) called from %x",
-        __builtin_return_address(0));
-
-    liballoc_unlock();
-    return PREFIX(malloc)(1);
-  }
-
-  if (l_memRoot == NULL) {
-    log("liballoc - initialization of liballoc " VERSION "");
-    l_memRoot = allocate_new_page(size);
-    if (l_memRoot == NULL) {
-      liballoc_unlock();
-      log("liballoc - initial l_memRoot initialization failed", p);
-      return NULL;
-    }
-
-    log("liballoc - set up first memory major %x", l_memRoot);
-  }
-
-  log("liballoc - %x PREFIX(malloc)( %i ): ", __builtin_return_address(0),
-      size);
-
-  maj = l_memRoot;
-  startedBet = 0;
-
-  if (l_bestBet != NULL) {
-    bestSize = l_bestBet->size - l_bestBet->usage;
-
-    if (bestSize > (size + sizeof(struct liballoc_minor))) {
-      maj = l_bestBet;
-      startedBet = 1;
-    }
-  }
-
-  while (maj != NULL) {
-    diff = maj->size - maj->usage;
-
-    if (bestSize < diff) {
-
-      l_bestBet = maj;
-      bestSize = diff;
-    }
-
-#ifdef USE_CASE1
-
-    if (diff < (size + sizeof(struct liballoc_minor))) {
-      log("liballoc - (warning) CASE 1: Insufficient space in block %x", maj);
-
-      if (maj->next != NULL) {
-        maj = maj->next;
-        continue;
-      }
-
-      if (startedBet == 1) {
-        maj = l_memRoot;
-        startedBet = 0;
-        continue;
-      }
-
-      maj->next = allocate_new_page(size);
-      if (maj->next == NULL)
-        break;
-      maj->next->prev = maj;
-      maj = maj->next;
-    }
-
-#endif
-
-#ifdef USE_CASE2
-
-    if (maj->first == NULL) {
-      maj->first = (struct liballoc_minor *)((uintptr_t)maj +
-                                             sizeof(struct liballoc_major));
-
-      maj->first->magic = LIBALLOC_MAGIC;
-      maj->first->prev = NULL;
-      maj->first->next = NULL;
-      maj->first->block = maj;
-      maj->first->size = size;
-      maj->first->req_size = req_size;
-      maj->usage += size + sizeof(struct liballoc_minor);
-
-      l_inuse += size;
-
-      p = (void *)((uintptr_t)(maj->first) + sizeof(struct liballoc_minor));
-
-      ALIGN(p);
-
-      log("liballoc - (warning) CASE 2: returning %x", p);
-      liballoc_unlock();
-      return p;
-    }
-
-#endif
-
-#ifdef USE_CASE3
-
-    diff = (uintptr_t)(maj->first);
-    diff -= (uintptr_t)maj;
-    diff -= sizeof(struct liballoc_major);
-
-    if (diff >= (size + sizeof(struct liballoc_minor))) {
-
-      maj->first->prev =
-          (struct liballoc_minor *)((uintptr_t)maj +
-                                    sizeof(struct liballoc_major));
-      maj->first->prev->next = maj->first;
-      maj->first = maj->first->prev;
-
-      maj->first->magic = LIBALLOC_MAGIC;
-      maj->first->prev = NULL;
-      maj->first->block = maj;
-      maj->first->size = size;
-      maj->first->req_size = req_size;
-      maj->usage += size + sizeof(struct liballoc_minor);
-
-      l_inuse += size;
-
-      p = (void *)((uintptr_t)(maj->first) + sizeof(struct liballoc_minor));
-      ALIGN(p);
-
-      log("liballoc - (warning) CASE 3: returning %x", p);
-      liballoc_unlock();
-      return p;
-    }
-
-#endif
-
-#ifdef USE_CASE4
-
-    min = maj->first;
-
-    while (min != NULL) {
-
-      if (min->next == NULL) {
-
-        diff = (uintptr_t)(maj) + maj->size;
-        diff -= (uintptr_t)min;
-        diff -= sizeof(struct liballoc_minor);
-        diff -= min->size;
-
-        if (diff >= (size + sizeof(struct liballoc_minor))) {
-
-          min->next = (struct liballoc_minor *)((uintptr_t)min +
-                                                sizeof(struct liballoc_minor) +
-                                                min->size);
-          min->next->prev = min;
-          min = min->next;
-          min->next = NULL;
-          min->magic = LIBALLOC_MAGIC;
-          min->block = maj;
-          min->size = size;
-          min->req_size = req_size;
-          maj->usage += size + sizeof(struct liballoc_minor);
-
-          l_inuse += size;
-
-          p = (void *)((uintptr_t)min + sizeof(struct liballoc_minor));
-          ALIGN(p);
-
-          log("liballoc - (warning) CASE 4.1: returning %x", p);
-          liballoc_unlock();
-          return p;
-        }
-      }
-
-      if (min->next != NULL) {
-
-        diff = (uintptr_t)(min->next);
-        diff -= (uintptr_t)min;
-        diff -= sizeof(struct liballoc_minor);
-        diff -= min->size;
-
-        if (diff >= (size + sizeof(struct liballoc_minor))) {
-
-          new_min = (struct liballoc_minor *)((uintptr_t)min +
-                                              sizeof(struct liballoc_minor) +
-                                              min->size);
-
-          new_min->magic = LIBALLOC_MAGIC;
-          new_min->next = min->next;
-          new_min->prev = min;
-          new_min->size = size;
-          new_min->req_size = req_size;
-          new_min->block = maj;
-          min->next->prev = new_min;
-          min->next = new_min;
-          maj->usage += size + sizeof(struct liballoc_minor);
-
-          l_inuse += size;
-
-          p = (void *)((uintptr_t)new_min + sizeof(struct liballoc_minor));
-          ALIGN(p);
-
-          log("liballoc - (warning) CASE 4.2: returning %x", p);
-          liballoc_unlock();
-          return p;
-        }
-      }
-
-      min = min->next;
-    }
-
-#endif
-
-#ifdef USE_CASE5
-
-    if (maj->next == NULL) {
-      log("liballoc - (warning) CASE 5: block full");
-
-      if (startedBet == 1) {
-        maj = l_memRoot;
-        startedBet = 0;
-        continue;
-      }
-
-      maj->next = allocate_new_page(size);
-      if (maj->next == NULL)
-        break;
-      maj->next->prev = maj;
-    }
-
-#endif
-
-    maj = maj->next;
-  }
-
-  liballoc_unlock();
-
-  log("liballoc - (warning) All cases exhausted. No memory available.");
-  log("liballoc - (warning) PREFIX(malloc)( %i ) returning NULL.", size);
-  liballoc_dump();
-
-  return NULL;
-}
-
-void PREFIX(free)(void *ptr) {
-  struct liballoc_minor *min;
-  struct liballoc_major *maj;
-
-  if (ptr == NULL) {
-    l_warningCount += 1;
-    log("liballoc - (warning) PREFIX(free)( NULL ) called from %x",
-        __builtin_return_address(0));
-
-    return;
-  }
-
-  UNALIGN(ptr);
-
-  liballoc_lock();
-
-  min =
-      (struct liballoc_minor *)((uintptr_t)ptr - sizeof(struct liballoc_minor));
-
-  if (min->magic != LIBALLOC_MAGIC) {
-    l_errorCount += 1;
-
-    if (((min->magic & 0xFFFFFF) == (LIBALLOC_MAGIC & 0xFFFFFF)) ||
-        ((min->magic & 0xFFFF) == (LIBALLOC_MAGIC & 0xFFFF)) ||
-        ((min->magic & 0xFF) == (LIBALLOC_MAGIC & 0xFF))) {
-      l_possibleOverruns += 1;
-      log("liballoc - (warning) Possible 1-3 byte overrun for magic %x != %x",
-          min->magic, LIBALLOC_MAGIC);
-    }
-
-    if (min->magic == LIBALLOC_DEAD) {
-      log("liballoc - multiple PREFIX(free)() attempt on %x from %x.", ptr,
-          __builtin_return_address(0));
-    } else {
-      log("liballoc - Bad PREFIX(free)( %x ) called from %x", ptr,
-          __builtin_return_address(0));
-    }
-
-    liballoc_unlock();
-    return;
-  }
-
-  log("liballoc - %x PREFIX(free)( %x ): ", __builtin_return_address(0), ptr);
-
-  maj = min->block;
-
-  l_inuse -= min->size;
-
-  maj->usage -= (min->size + sizeof(struct liballoc_minor));
-  min->magic = LIBALLOC_DEAD;
-
-  if (min->next != NULL)
-    min->next->prev = min->prev;
-  if (min->prev != NULL)
-    min->prev->next = min->next;
-
-  if (min->prev == NULL)
-    maj->first = min->next;
-
-  if (maj->first == NULL) {
-    if (l_memRoot == maj)
-      l_memRoot = maj->next;
-    if (l_bestBet == maj)
-      l_bestBet = NULL;
-    if (maj->prev != NULL)
-      maj->prev->next = maj->next;
-    if (maj->next != NULL)
-      maj->next->prev = maj->prev;
-    l_allocated -= maj->size;
-
-    liballoc_free(maj, maj->pages);
-  } else {
-    if (l_bestBet != NULL) {
-      int bestSize = l_bestBet->size - l_bestBet->usage;
-      int majSize = maj->size - maj->usage;
-
-      if (majSize > bestSize)
-        l_bestBet = maj;
-    }
-  }
-
-  log("liballoc - (warning) OK");
-
-  liballoc_unlock();
-}
-
-void *PREFIX(calloc)(size_t nobj, size_t size) {
-  int real_size;
-  void *p;
-
-  real_size = nobj * size;
-
-  p = PREFIX(malloc)(real_size);
-
-  liballoc_memset(p, 0, real_size);
-
-  return p;
-}
-
-void *PREFIX(realloc)(void *p, size_t size) {
-  void *ptr;
-  struct liballoc_minor *min;
-  unsigned int real_size;
-
-  if (size == 0) {
-    PREFIX(free)
-    (p);
-    return NULL;
-  }
-
-  if (p == NULL)
-    return PREFIX(malloc)(size);
-
-  ptr = p;
-  UNALIGN(ptr);
-
-  liballoc_lock();
-
-  min =
-      (struct liballoc_minor *)((uintptr_t)ptr - sizeof(struct liballoc_minor));
-
-  if (min->magic != LIBALLOC_MAGIC) {
-    l_errorCount += 1;
-
-    if (((min->magic & 0xFFFFFF) == (LIBALLOC_MAGIC & 0xFFFFFF)) ||
-        ((min->magic & 0xFFFF) == (LIBALLOC_MAGIC & 0xFFFF)) ||
-        ((min->magic & 0xFF) == (LIBALLOC_MAGIC & 0xFF))) {
-      l_possibleOverruns += 1;
-      log("liballoc - Possible 1-3 byte overrun for magic %x != %x", min->magic,
-          LIBALLOC_MAGIC);
-    }
-
-    if (min->magic == LIBALLOC_DEAD) {
-      log("liballoc - liballoc: multiple PREFIX(free)() attempt on %x from %x.",
-          ptr, __builtin_return_address(0));
-    } else {
-      log("liballoc - liballoc: Bad PREFIX(free)( %x ) called from %x", ptr,
-          __builtin_return_address(0));
-    }
-
-    liballoc_unlock();
-    return NULL;
-  }
-
-  real_size = min->req_size;
-
-  if (real_size >= size) {
-    min->req_size = size;
-    liballoc_unlock();
-    return p;
-  }
-
-  liballoc_unlock();
-
-  ptr = PREFIX(malloc)(size);
-  liballoc_memcpy(ptr, p, real_size);
-  PREFIX(free)
-  (p);
-
-  return ptr;
-}
\ No newline at end of file
diff --git a/kernel/src/mm/liballoc/liballoc.h b/kernel/src/mm/liballoc/liballoc.h
deleted file mode 100644
index 6b0183a..0000000
--- a/kernel/src/mm/liballoc/liballoc.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright: Durand Miller <clutter@djm.co.za>
-#ifndef LIBALLOC_H
-#define LIBALLOC_H
-
-#include <stddef.h>
-#include <stdint.h>
-#include <sys/log.h>
-
-#define PREFIX(func) func
-
-#ifdef _DEBUG
-void liballoc_dump();
-#endif // _DEBUG
-
-extern int liballoc_lock();
-extern int liballoc_unlock();
-extern void *liballoc_alloc(size_t);
-extern int liballoc_free(void *, size_t);
-
-extern void *PREFIX(malloc)(size_t);
-extern void *PREFIX(realloc)(void *, size_t);
-extern void *PREFIX(calloc)(size_t, size_t);
-extern void PREFIX(free)(void *);
-
-#endif // LIBALLOC_H
\ No newline at end of file
diff --git a/kernel/src/mm/liballoc/liballoc_soaplin.c b/kernel/src/mm/liballoc/liballoc_soaplin.c
deleted file mode 100644
index 97a94a4..0000000
--- a/kernel/src/mm/liballoc/liballoc_soaplin.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "mm/liballoc/liballoc.h"
-#include "mm/vmm.h"
-#include <lib/spinlock.h>
-#include <mm/vma.h>
-#include <stddef.h>
-
-extern vma_context_t *kernel_vma_context;
-
-static spinlock_t liballoc_lock_var = {0};
-
-int liballoc_lock() {
-  spinlock_acquire(&liballoc_lock_var);
-  return 0;
-}
-
-int liballoc_unlock() {
-  spinlock_release(&liballoc_lock_var);
-  return 0;
-}
-
-void *liballoc_alloc(size_t pages) {
-  return vma_alloc(kernel_vma_context, pages, VMM_PRESENT | VMM_WRITABLE);
-}
-
-int liballoc_free(void *ptr, size_t pages) {
-  (void)pages;
-  vma_free(kernel_vma_context, ptr);
-  return 0;
-}
-
-// void *malloc(size_t s) { return PREFIX(malloc)(s); }
-// void *realloc(void *v, size_t s) { return PREFIX(realloc)(v, s); }
-// void *calloc(size_t s1, size_t s) { return PREFIX(calloc)(s1, s); }
-// void free(void *v) { return PREFIX(free)(v); }
\ No newline at end of file
diff --git a/kernel/src/mm/memop.c b/kernel/src/mm/memop.c
old mode 100644
new mode 100755
index 0fdff0e..1bd42be
--- a/kernel/src/mm/memop.c
+++ b/kernel/src/mm/memop.c
@@ -1,58 +1,60 @@
-// Copyright (C) 2024 Sipaa Projects
-// This code is part of the Soaplin kernel and is licensed under the terms of
-// the MIT License.
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  memop.c - Memory operations implementation.
+ */
 
-#include "mm/pmm.h"
-#include <stddef.h>
+#include <mm/memop.h>
 #include <stdint.h>
 
-void *memcpy(void *dest, const void *src, size_t n) {
-  uint8_t *pdest = (uint8_t *)dest;
-  const uint8_t *psrc = (const uint8_t *)src;
+void *memcpy(void *restrict dest, const void *restrict src, size_t n) {
+    uint8_t *restrict pdest = (uint8_t *restrict)dest;
+    const uint8_t *restrict psrc = (const uint8_t *restrict)src;
 
-  for (size_t i = 0; i < n; i++) {
-    pdest[i] = psrc[i];
-  }
+    for (size_t i = 0; i < n; i++) {
+        pdest[i] = psrc[i];
+    }
 
-  return dest;
+    return dest;
 }
 
 void *memset(void *s, int c, size_t n) {
-  uint8_t *p = (uint8_t *)s;
+    uint8_t *p = (uint8_t *)s;
 
-  for (size_t i = 0; i < n; i++) {
-    p[i] = (uint8_t)c;
-  }
+    for (size_t i = 0; i < n; i++) {
+        p[i] = (uint8_t)c;
+    }
 
-  return s;
+    return s;
 }
 
 void *memmove(void *dest, const void *src, size_t n) {
-  uint8_t *pdest = (uint8_t *)dest;
-  const uint8_t *psrc = (const uint8_t *)src;
+    uint8_t *pdest = (uint8_t *)dest;
+    const uint8_t *psrc = (const uint8_t *)src;
 
-  if (src > dest) {
-    for (size_t i = 0; i < n; i++) {
-      pdest[i] = psrc[i];
+    if (src > dest) {
+        for (size_t i = 0; i < n; i++) {
+            pdest[i] = psrc[i];
+        }
+    } else if (src < dest) {
+        for (size_t i = n; i > 0; i--) {
+            pdest[i-1] = psrc[i-1];
+        }
     }
-  } else if (src < dest) {
-    for (size_t i = n; i > 0; i--) {
-      pdest[i - 1] = psrc[i - 1];
-    }
-  }
 
-  return dest;
+    return dest;
 }
 
 int memcmp(const void *s1, const void *s2, size_t n) {
-  const uint8_t *p1 = (const uint8_t *)s1;
-  const uint8_t *p2 = (const uint8_t *)s2;
+    const uint8_t *p1 = (const uint8_t *)s1;
+    const uint8_t *p2 = (const uint8_t *)s2;
 
-  for (size_t i = 0; i < n; i++) {
-    if (p1[i] != p2[i]) {
-      return p1[i] < p2[i] ? -1 : 1;
+    for (size_t i = 0; i < n; i++) {
+        if (p1[i] != p2[i]) {
+            return p1[i] < p2[i] ? -1 : 1;
+        }
     }
-  }
 
-  return 0;
+    return 0;
 }
\ No newline at end of file
diff --git a/kernel/src/mm/memop.h b/kernel/src/mm/memop.h
index 7a62f7e..d556d74 100755
--- a/kernel/src/mm/memop.h
+++ b/kernel/src/mm/memop.h
@@ -1,13 +1,15 @@
-// Copyright (C) 2024 Sipaa Projects
-// This code is part of the Soaplin kernel and is licensed under the terms of
-// the MIT License.
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  memop.h - Memory operations declarations.
+ */
 
 #pragma once
 
 #include <stddef.h>
-#include <stdint.h>
 
-void *memcpy(void *dest, const void *src, size_t n);
+void *memcpy(void *restrict dest, const void *restrict src, size_t n);
 void *memset(void *s, int c, size_t n);
 void *memmove(void *dest, const void *src, size_t n);
 int memcmp(const void *s1, const void *s2, size_t n);
\ No newline at end of file
diff --git a/kernel/src/mm/paging.c b/kernel/src/mm/paging.c
new file mode 100755
index 0000000..dd2953a
--- /dev/null
+++ b/kernel/src/mm/paging.c
@@ -0,0 +1,214 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  vmm.c - Virtual memory manager
+ */
+
+#include <stdbool.h>
+#include <stddef.h>
+
+#include <arch/cpu.h>
+#include <boot/limine.h>
+#include <lib/log.h>
+#include <mm/memop.h>
+#include <mm/paging.h>
+#include <mm/pmm.h>
+#include <proc/exec/elf.h>
+#include <stdint.h>
+
+pagemap_t pg_kernel_pm = NULL;
+pagemap_t pg_current_pm = NULL;
+
+void pg_init() {
+#if !defined(__x86_64__)
+  fatal("vmm: not implemented\n");
+  hcf();
+#endif
+  // Our objective here is to recreate the
+  // kernel page map that Limine provide us
+
+  pg_kernel_pm = pg_alloc_pm();
+
+  uint64_t kvaddr = limine_get_kernel_vaddr();
+  uint64_t kpaddr = limine_get_kernel_paddr();
+
+  char *elf_addr = (char *)limine_get_kernel_ehdr_addr();
+  Elf64_Ehdr *ehdr = (Elf64_Ehdr *)elf_addr;
+
+  for (uint16_t i = 0; i < ehdr->e_phnum; i++) {
+    Elf64_Phdr *cur_phdr =
+        (Elf64_Phdr *)(elf_addr + ehdr->e_phoff + (i * ehdr->e_phentsize));
+    if (cur_phdr->p_type != PT_LOAD)
+      continue;
+
+    uintptr_t phys = (cur_phdr->p_vaddr - kvaddr) + kpaddr;
+    uint64_t flags = PTE_PRESENT;
+    if ((cur_phdr->p_flags & PF_X) == 0) {
+      flags |= PTE_NX;
+    }
+    if (cur_phdr->p_flags & PF_W) {
+      flags |= PTE_WRITE;
+    }
+
+    size_t length = ALIGN_UP(cur_phdr->p_memsz, PMM_PAGE_SIZE);
+
+    for (uint64_t i = 0; i < length; i += PMM_PAGE_SIZE) {
+      pg_map(pg_kernel_pm, cur_phdr->p_vaddr + i, phys + i, flags);
+    }
+    trace("vmm: Mapped range: %p -> %p (length: %x)\n", phys, cur_phdr->p_vaddr,
+          length);
+  }
+
+  for (uint64_t i = 0; i < 0x100000000; i += PMM_PAGE_SIZE)
+    pg_map(pg_kernel_pm, higher_half(i), i, PTE_PRESENT | PTE_WRITE);
+  trace("vmm: Mapped range: %p -> %p (length: %x)\n", 0x0, 0xFFFF800000000000,
+        0x100000000);
+
+  pg_load_pm(pg_kernel_pm);
+  trace("vmm: Initialized.\n");
+}
+
+void pg_load_pm(pagemap_t pm) {
+  if (!pm)
+    return;
+
+  pg_current_pm = pm;
+  cpu_load_pm((pagemap_t)physical((uint64_t)pm));
+}
+
+pagemap_t pg_alloc_pm() {
+  pagemap_t pm = (pagemap_t)higher_half((uint64_t)pmm_alloc_page());
+  memset((void *)pm, 0, PMM_PAGE_SIZE);
+
+  if (pg_kernel_pm) {
+    for (int i = 256; i < 512; i++)
+      pm[i] = pg_kernel_pm[i];
+  }
+
+  return pm;
+}
+
+void pg_free_pm(pagemap_t pm) {
+  if (pm == pg_kernel_pm) {
+    warn("vmm: Who tried to free the kernel's pagemap?!\n");
+    return;
+  }
+  pmm_free_page((void *)pm);
+}
+
+static uint64_t *__pg_get_next_lvl(uint64_t *level, uint64_t entry,
+                                   uint64_t flags, bool alloc) {
+  if (level[entry] & PTE_PRESENT)
+    return (uint64_t *)higher_half(PTE_GET_ADDR(level[entry]));
+  if (alloc) {
+    uint64_t *pml = (uint64_t *)higher_half((uint64_t)pmm_alloc_page());
+    memset(pml, 0, PMM_PAGE_SIZE);
+    level[entry] = (uint64_t)physical((uint64_t)pml) | flags;
+    return pml;
+  }
+  return NULL;
+}
+
+uint64_t pg_physical(pagemap_t pm, uint64_t vaddr) {
+  if (!pm)
+    return 0;
+
+  uint64_t pml4_entry = (vaddr >> 39) & 0x1ff;
+  uint64_t pml3_entry = (vaddr >> 30) & 0x1ff;
+  uint64_t pml2_entry = (vaddr >> 21) & 0x1ff;
+  uint64_t pml1_entry = (vaddr >> 12) & 0x1ff;
+
+  uint64_t *pml3 = __pg_get_next_lvl(pm, pml4_entry, 0, false);
+  if (!pml3)
+    return 0;
+  uint64_t *pml2 = __pg_get_next_lvl(pml3, pml3_entry, 0, false);
+  if (!pml2)
+    return 0;
+  uint64_t *pml1 = __pg_get_next_lvl(pml2, pml2_entry, 0, false);
+  if (!pml1)
+    return 0;
+
+  return pml1[pml1_entry] & PTE_ADDR_MASK;
+}
+
+void pg_map(pagemap_t pm, uint64_t vaddr, uint64_t paddr, uint64_t flags) {
+  if (!pm)
+    return;
+
+  uint64_t pml4_entry = (vaddr >> 39) & 0x1ff;
+  uint64_t pml3_entry = (vaddr >> 30) & 0x1ff;
+  uint64_t pml2_entry = (vaddr >> 21) & 0x1ff;
+  uint64_t pml1_entry = (vaddr >> 12) & 0x1ff;
+
+  uint64_t *pml3 =
+      __pg_get_next_lvl(pm, pml4_entry, PTE_PRESENT | PTE_WRITE, true);
+  uint64_t *pml2 =
+      __pg_get_next_lvl(pml3, pml3_entry, PTE_PRESENT | PTE_WRITE, true);
+  uint64_t *pml1 =
+      __pg_get_next_lvl(pml2, pml2_entry, PTE_PRESENT | PTE_WRITE, true);
+
+  pml1[pml1_entry] = paddr | flags;
+}
+
+void pg_map_user(pagemap_t pm, uint64_t vaddr, uint64_t paddr, uint64_t flags) {
+  if (!pm)
+    return;
+
+  uint64_t pml4_entry = (vaddr >> 39) & 0x1ff;
+  uint64_t pml3_entry = (vaddr >> 30) & 0x1ff;
+  uint64_t pml2_entry = (vaddr >> 21) & 0x1ff;
+  uint64_t pml1_entry = (vaddr >> 12) & 0x1ff;
+
+  uint64_t *pml3 = __pg_get_next_lvl(pm, pml4_entry, flags, true);
+  uint64_t *pml2 = __pg_get_next_lvl(pml3, pml3_entry, flags, true);
+  uint64_t *pml1 = __pg_get_next_lvl(pml2, pml2_entry, flags, true);
+
+  pml1[pml1_entry] = paddr | flags;
+}
+
+void pg_unmap(pagemap_t pm, uint64_t vaddr) {
+  if (!pm)
+    return;
+
+  uint64_t pml4_entry = (vaddr >> 39) & 0x1ff;
+  uint64_t pml3_entry = (vaddr >> 30) & 0x1ff;
+  uint64_t pml2_entry = (vaddr >> 21) & 0x1ff;
+  uint64_t pml1_entry = (vaddr >> 12) & 0x1ff;
+
+  uint64_t *pml3 = __pg_get_next_lvl(pm, pml4_entry, 0, false);
+  if (!pml3)
+    return;
+  uint64_t *pml2 = __pg_get_next_lvl(pml3, pml3_entry, 0, false);
+  if (!pml2)
+    return;
+  uint64_t *pml1 = __pg_get_next_lvl(pml2, pml2_entry, 0, false);
+  if (!pml1)
+    return;
+
+  pml1[pml1_entry] = 0;
+  cpu_invalidate_page(vaddr);
+}
+
+void pg_protect(pagemap_t pm, uint64_t vaddr, uint64_t flags) {
+  if (!pm)
+    return;
+
+  uint64_t pml4_entry = (vaddr >> 39) & 0x1ff;
+  uint64_t pml3_entry = (vaddr >> 30) & 0x1ff;
+  uint64_t pml2_entry = (vaddr >> 21) & 0x1ff;
+  uint64_t pml1_entry = (vaddr >> 12) & 0x1ff;
+
+  uint64_t *pml3 = __pg_get_next_lvl(pm, pml4_entry, 0, false);
+  if (!pml3)
+    return;
+  uint64_t *pml2 = __pg_get_next_lvl(pml3, pml3_entry, 0, false);
+  if (!pml2)
+    return;
+  uint64_t *pml1 = __pg_get_next_lvl(pml2, pml2_entry, 0, false);
+  if (!pml1)
+    return;
+
+  uint64_t paddr = pml1[pml1_entry] & PTE_ADDR_MASK;
+  pml1[pml1_entry] = paddr | flags;
+}
\ No newline at end of file
diff --git a/kernel/src/mm/paging.h b/kernel/src/mm/paging.h
new file mode 100755
index 0000000..c41eec2
--- /dev/null
+++ b/kernel/src/mm/paging.h
@@ -0,0 +1,39 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  pg.c - Virtual memory manager
+ */
+
+#pragma once
+
+// Page flags
+#include <stdint.h>
+
+#define PTE_ADDR_MASK 0x000ffffffffff000ull
+#define PTE_GET_ADDR(VALUE) ((VALUE) & PTE_ADDR_MASK)
+#define PTE_GET_FLAGS(VALUE) ((VALUE) & ~PTE_ADDR_MASK)
+
+#define PTE_PRESENT  (1 << 0)
+#define PTE_WRITE    (1 << 1)
+#define PTE_USER     (1 << 2)
+#define PTE_NX       (1ULL << 63) // NX = No eXecute.
+
+typedef uint64_t *pagemap_t;
+
+extern pagemap_t pg_kernel_pm;
+extern pagemap_t pg_current_pm;
+
+
+void pg_init();
+
+pagemap_t pg_alloc_pm();
+void pg_free_pm(pagemap_t pm);
+void pg_load_pm(pagemap_t pm);
+
+uint64_t pg_physical(pagemap_t pm, uint64_t vaddr);
+void pg_map(pagemap_t pm, uint64_t vaddr, uint64_t paddr, uint64_t flags);
+void pg_map_user(pagemap_t pm, uint64_t vaddr, uint64_t paddr,
+                  uint64_t flags);
+void pg_unmap(pagemap_t pm, uint64_t vaddr);
+void pg_protect(pagemap_t pm, uint64_t vaddr, uint64_t flags);
\ No newline at end of file
diff --git a/kernel/src/mm/pmm.c b/kernel/src/mm/pmm.c
old mode 100644
new mode 100755
index 8dcf73a..7cac5c4
--- a/kernel/src/mm/pmm.c
+++ b/kernel/src/mm/pmm.c
@@ -1,97 +1,102 @@
-#include "limine.h"
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  pmm.c - Physical memory allocator
+ */
+
+#include "arch/cpu.h"
+#include <stdint.h>
+#include <stddef.h>
+
+#include <boot/limine.h>
+#include <lib/log.h>
 #include <mm/memop.h>
 #include <mm/pmm.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <sys/log.h>
 
-pmm_stack_t stack;
-struct limine_memmap_response *_memmap;
+uint64_t pmm_available_pages = 0;
+uint64_t pmm_total_pages = 0;
 
-uint64_t hhdm_offset = 0x0;
+static pmm_region_t *pmm_region_list_head = NULL;
+static pmm_page_t *pmm_free_list_head = NULL;
 
-__attribute__((
-    used, section(".limine_requests"))) struct limine_memmap_request mm_req = {
-    .id = LIMINE_MEMMAP_REQUEST, .revision = 3};
+void pmm_free_page(void *mem) {
+    if (!mem)
+        return;
 
-__attribute__((
-    used, section(".limine_requests"))) struct limine_hhdm_request hhdm_req = {
-    .id = LIMINE_HHDM_REQUEST, .revision = 3};
+    pmm_page_t *page = (pmm_page_t*)higher_half((uint64_t)mem);
+    page->next = pmm_free_list_head ? (pmm_page_t*)higher_half((uint64_t)pmm_free_list_head) : 0x0;
+    pmm_free_list_head = page;
 
-int pmm_init() {
-  uint64_t free_pages = 0;
-  hhdm_offset = hhdm_req.response->offset;
-
-  struct limine_memmap_response *memmap = mm_req.response;
-  _memmap = memmap;
-
-  // DEBUG("mm", "----- PMM //INFO -----");
-  int freemem = 0;
-  for (uint64_t i = 0; i < memmap->entry_count; i++) {
-    if (memmap->entries[i]->type == LIMINE_MEMMAP_USABLE) {
-      // DEBUG("mm", " - USABLE ENTRY\t\t@ 0x%.16llx, size: 0x%.16llx",
-      // memmap->entries[i]->base, memmap->entries[i]->length);
-      free_pages += DIV_ROUND_UP(memmap->entries[i]->length, PMM_PAGE_SIZE);
-      freemem += memmap->entries[i]->length;
-    }
-  }
-
-  uint64_t array_size = ALIGN_UP(free_pages * 8, PMM_PAGE_SIZE);
-
-  for (uint64_t i = 0; i < memmap->entry_count; i++) {
-    struct limine_memmap_entry *entry = memmap->entries[i];
-    if (entry->length >= array_size && entry->type == LIMINE_MEMMAP_USABLE) {
-      stack.pages = (uintptr_t *)HIGHER_HALF(entry->base);
-      entry->length -= array_size;
-      entry->base += array_size;
-      // DEBUG("mm", " - STACK START\t\t@ 0x%.16llx", stack.pages);
-      break;
-    }
-  }
-
-  for (uint64_t i = 0; i < memmap->entry_count; i++) {
-    struct limine_memmap_entry *entry = memmap->entries[i];
-    if (entry->type == LIMINE_MEMMAP_USABLE) {
-      for (uint64_t j = 0; j < entry->length; j += PMM_PAGE_SIZE) {
-        stack.pages[stack.idx++] = entry->base + j;
-      }
-    }
-  }
-
-  stack.max = stack.idx;
-  // DEBUG("mm", " - MAX INDEX:\t\t%d", stack.max);
-  // DEBUG("mm", " - CURRENT INDEX:\t%d", stack.idx);
-  // DEBUG("mm", "--------------------");
-
-  log("pmm - %dmb is available to us.\n", freemem / (1024 * 1024));
-  return 0;
+    pmm_available_pages++;
 }
 
-void *pmm_request_page() {
-  if (stack.idx == 0) {
-    // ERROR("mm", "No more pages available.");
-    log("pmm - out of memory.\n");
-    asm("cli");
-    while (1) {
-      asm("hlt");
-    }
-    return NULL;
-  }
+static void __pmm_steal_pages_from_region_head(int pages) {
+    for (int i = 0; i < pages; i++) {
+        pmm_region_list_head->length -= PMM_PAGE_SIZE;
+        void *page = (void*)pmm_region_list_head->base +
+                            pmm_region_list_head->length;
+        pmm_free_page(page);
+        //trace("pmm: stealer: page is %p\n", page);
 
-  uint64_t page_addr = stack.pages[--stack.idx];
-  memset(HIGHER_HALF(page_addr), 0, PMM_PAGE_SIZE);
-  return (void *)page_addr;
+        if (pmm_region_list_head->length == 0)
+        {
+            // If a region is totally consumed,
+            // we can turn it into a free page :)
+            // So our 4kb aren't really lost
+            void *mem = (void*)pmm_region_list_head;
+            pmm_region_list_head = pmm_region_list_head->next;
+            
+            pmm_free_page(mem);
+        }
+    }
 }
 
-void pmm_free_page(void *ptr) {
-  if (ptr == NULL)
-    return;
+void *pmm_alloc_page() {
+    if (!pmm_free_list_head)
+    {
+        if (!pmm_region_list_head) {
+            fatal("pmm: out of memory!\n");
+            hcf();
+        }
+        __pmm_steal_pages_from_region_head(4);
+        // et voila, we now have 4 free pages to allocate
+    }
 
-  if (stack.idx >= stack.max) {
-    // ERROR("mm", "Stack overflow attempt while freeing a page.");
-    log("pmm - could not free the page: stack overflow.\n");
-    return;
-  }
+    pmm_available_pages--;
 
-  stack.pages[stack.idx++] = (uint64_t)ptr;
+    pmm_page_t *page = pmm_free_list_head;
+    pmm_free_list_head = page->next;
+
+    memset(page, 0, PMM_PAGE_SIZE);
+    return (void*)physical((uint64_t)page);
+}
+
+void pmm_init() {
+    struct limine_memmap_response *mmap = limine_get_memmap();
+
+    for (uint64_t i = 0; i < mmap->entry_count; i++) {
+        struct limine_memmap_entry *entry = mmap->entries[i];
+
+        if (entry->type == LIMINE_MEMMAP_USABLE || 
+            entry->type == LIMINE_MEMMAP_BOOTLOADER_RECLAIMABLE)
+        {
+            trace("pmm: Found an usable memory block: %p-%p\n", entry->base, entry->base + entry->length);
+
+            uint64_t newlen = ALIGN_DOWN(entry->length, PMM_PAGE_SIZE);
+
+            // Give a page to store the PMM region.
+            // When the region is fully consumed, the
+            // page is freed so that it can be used (i love recycling)
+            pmm_region_t *reg = (pmm_region_t*)higher_half(entry->base);
+            reg->base = entry->base + PMM_PAGE_SIZE;
+            reg->length = newlen - PMM_PAGE_SIZE;
+            reg->next = pmm_region_list_head;
+            pmm_region_list_head = reg;
+
+            pmm_available_pages += reg->length / PMM_PAGE_SIZE;
+        }
+    }
+
+    trace("pmm: %d pages available\n", pmm_available_pages);
 }
\ No newline at end of file
diff --git a/kernel/src/mm/pmm.h b/kernel/src/mm/pmm.h
old mode 100644
new mode 100755
index 533a457..70d5fc7
--- a/kernel/src/mm/pmm.h
+++ b/kernel/src/mm/pmm.h
@@ -1,28 +1,48 @@
-#ifndef PMM_H
-#define PMM_H
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  pmm.c - Physical memory allocator
+ */
+
+#pragma once
 
 #include <stdint.h>
-#define PMM_PAGE_SIZE 4096
-
-typedef struct pmm_stack {
-  uintptr_t *pages;
-  uint64_t idx;
-  uint64_t max;
-} pmm_stack_t;
-
-extern uint64_t hhdm_offset;
+#include <boot/limine.h>
 
 #define DIV_ROUND_UP(x, y)                                                     \
   (((uint64_t)(x) + ((uint64_t)(y) - 1)) / (uint64_t)(y))
 #define ALIGN_UP(x, y) (DIV_ROUND_UP(x, y) * (uint64_t)(y))
 #define ALIGN_DOWN(x, y) (((uint64_t)(x) / (uint64_t)(y)) * (uint64_t)(y))
 
-#define HIGHER_HALF(ptr) ((void *)((uint64_t)ptr) + hhdm_offset)
-#define PHYSICAL(ptr) ((void *)((uint64_t)ptr) - hhdm_offset)
+#define PMM_PAGE_SIZE 0x1000 // We are using 4kb pages.
 
-int pmm_init();
-void *pmm_request_page();
-void pmm_free_page(void *ptr);
-void pmm_dump();
+typedef struct __pmm_page {
+    struct __pmm_page *next;
+} pmm_page_t;
 
-#endif // PMM_H
\ No newline at end of file
+typedef struct __pmm_region {
+    uint64_t base;
+    uint64_t length;
+    struct __pmm_region *next;
+} pmm_region_t;
+
+inline uint64_t higher_half(uint64_t addr) {
+    uint64_t hhdm_off = limine_get_hhdm_offset();
+    if (addr > hhdm_off)
+        return addr;
+
+    return addr + hhdm_off;
+}
+
+inline uint64_t physical(uint64_t addr) {
+    uint64_t hhdm_off = limine_get_hhdm_offset();
+    if (addr < hhdm_off)
+        return addr;
+
+    return addr - hhdm_off;
+}
+
+void pmm_free_page(void *mem);
+void *pmm_alloc_page();
+void pmm_init();
\ No newline at end of file
diff --git a/kernel/src/mm/pmm.md b/kernel/src/mm/pmm.md
new file mode 100755
index 0000000..e69de29
diff --git a/kernel/src/mm/vma.c b/kernel/src/mm/vma.c
old mode 100644
new mode 100755
index 3412e92..d22caf3
--- a/kernel/src/mm/vma.c
+++ b/kernel/src/mm/vma.c
@@ -1,181 +1,115 @@
-// credit to kevin for writing the vma
-// go check his projects: https://github.com/kevinalavik
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  vma.c - Virtual memory allocator
+ */
 
+#include <stddef.h>
+#include <stdint.h>
+
+#include "lib/log.h"
+#include "mm/memop.h"
+#include <mm/paging.h>
+#include "mm/vma.h"
 #include "mm/pmm.h"
-#include "mm/vmm.h"
-#include <mm/memop.h>
-#include <mm/vma.h>
-#include <sys/log.h>
 
-vma_context_t *kernel_vma_context;
-
-vma_context_t *vma_create_context(pagemap_t *pagemap) {
-  log("vma - creating VMA context with pagemap: 0x%.16llx\n",
-      (uint64_t)pagemap);
-
-  vma_context_t *ctx = (vma_context_t *)HIGHER_HALF(pmm_request_page());
-  if (ctx == NULL) {
-    log("vma - failed to allocate VMA context\n");
-    return NULL;
-  }
-  log("vma - allocated VMA context at 0x%.16llx\n", (uint64_t)ctx);
-  memset(ctx, 0, sizeof(vma_context_t));
-  log("vma - zeroed out VMA context at 0x%.16llx\n", (uint64_t)ctx);
-
-  ctx->root = (vma_region_t *)HIGHER_HALF(pmm_request_page());
-  if (ctx->root == NULL) {
-    log("vma - failed to allocate root region\n");
-    pmm_free_page((void *)PHYSICAL(ctx));
-    return NULL;
-  }
-  log("vma - allocated root region at 0x%.16llx\n", (uint64_t)ctx->root);
-
-  ctx->pagemap = pagemap;
-  ctx->root->start = PMM_PAGE_SIZE;
-  ctx->root->size = 0;
-
-  log("vma - VMA context created at 0x%.16llx with root region at 0x%.16llx\n",
-      (uint64_t)ctx, (uint64_t)ctx->root);
-  return ctx;
-}
-
-void vma_destroy_context(vma_context_t *ctx) {
-  log("vma - destroying VMA context at 0x%.16llx\n", (uint64_t)ctx);
-
-  if (ctx->root == NULL || ctx->pagemap == NULL) {
-    log("vma - invalid context or root passed to vma_destroy_context\n");
-    return;
-  }
-
-  vma_region_t *region = ctx->root;
-  while (region != NULL) {
-    log("vma - freeing region at 0x%.16llx\n", (uint64_t)region);
-    vma_region_t *next = region->next;
-    pmm_free_page((void *)PHYSICAL(region));
-    region = next;
-  }
-
-  pmm_free_page((void *)PHYSICAL(ctx));
-  log("vma - destroyed VMA context at 0x%.16llx\n", (uint64_t)ctx);
-}
-
-void *vma_alloc(vma_context_t *ctx, uint64_t size, uint64_t flags) {
-  if (ctx == NULL || ctx->root == NULL || ctx->pagemap == NULL) {
-    log("vma - invalid context or root passed to vma_alloc\n");
-    return NULL;
-  }
-
-  vma_region_t *region = ctx->root;
-  vma_region_t *new_region;
-  vma_region_t *last_region = ctx->root;
-
-  while (region != NULL) {
-    if (region->next == NULL ||
-        region->start + region->size < region->next->start) {
-      new_region = (vma_region_t *)HIGHER_HALF(pmm_request_page());
-      if (new_region == NULL) {
-        log("vma - failed to allocate new VMA region\n");
+vma_ctx_t *vma_alloc_ctx(pagemap_t pm, uint64_t start) {
+    if (pm == NULL)
         return NULL;
-      }
 
-      memset(new_region, 0, sizeof(vma_region_t));
-      new_region->size = size;
-      new_region->flags = flags;
-      new_region->start = region->start + region->size;
-      new_region->next = region->next;
-      new_region->prev = region;
-      region->next = new_region;
+    vma_ctx_t *ctx = (vma_ctx_t *)higher_half((uint64_t)pmm_alloc_page());
+    ctx->pm = pm;
+    
+    vma_region_t *root_reg = (vma_region_t *)higher_half((uint64_t)pmm_alloc_page());
+    root_reg->start = start;
+    root_reg->length = 0;
+    root_reg->next = NULL;
 
-      for (uint64_t i = 0; i < size; i++) {
-        uint64_t page = (uint64_t)pmm_request_page();
-        if (page == 0) {
-          log("vma - failed to allocate physical memory for VMA region\n");
-          return NULL;
+    ctx->root = root_reg;
+    return ctx;
+}
+
+void *vma_alloc(vma_ctx_t *ctx, size_t length, uint64_t flags) {
+    if (!ctx || !ctx->pm || !ctx->root)
+        return NULL;
+
+    vma_region_t *current = ctx->root;
+    while (current) {
+        if (current->next == NULL || current->start + (current->length * PMM_PAGE_SIZE) < current->next->start)
+        {
+            vma_region_t *reg = (vma_region_t*)higher_half((uint64_t)pmm_alloc_page());
+            memset((void*)reg, 0, sizeof(vma_region_t));
+            reg->start = current->start + (current->length * PMM_PAGE_SIZE);
+            reg->length = length;
+            reg->pflags = flags;
+            reg->next = current->next;
+            current->next = reg;
+
+            // Now, allocate the memory
+            for (uint64_t i = 0; i < length; i++) {
+                uint64_t physical = (uint64_t)pmm_alloc_page();
+                pg_map(ctx->pm, reg->start + (i * PMM_PAGE_SIZE), physical, flags);
+            }
+
+            return (void*)reg->start;
         }
 
-        vmm_map(ctx->pagemap, new_region->start + i * PMM_PAGE_SIZE, page,
-                new_region->flags);
-      }
-
-      return (void *)new_region->start;
+        current = current->next;
     }
-    region = region->next;
-  }
-
-  new_region = (vma_region_t *)HIGHER_HALF(pmm_request_page());
-  if (new_region == NULL) {
-    log("vma - failed to allocate new VMA region\n");
     return NULL;
-  }
-
-  memset(new_region, 0, sizeof(vma_region_t));
-
-  last_region->next = new_region;
-  new_region->prev = last_region;
-  new_region->start = last_region->start + last_region->size;
-  new_region->size = size;
-  new_region->flags = flags;
-  new_region->next = NULL;
-
-  for (uint64_t i = 0; i < size; i++) {
-    uint64_t page = (uint64_t)pmm_request_page();
-    if (page == 0) {
-      log("vma - failed to allocate physical memory for VMA region\n");
-      return NULL;
-    }
-
-    vmm_map(ctx->pagemap, new_region->start + i * PMM_PAGE_SIZE, page,
-            new_region->flags);
-  }
-
-  return (void *)new_region->start;
 }
 
-void vma_free(vma_context_t *ctx, void *ptr) {
-  if (ctx == NULL) {
-    log("vma - invalid context passed to vma_free\n");
-    return;
-  }
-
-  vma_region_t *region = ctx->root;
-  while (region != NULL) {
-    if (region->start == (uint64_t)ptr) {
-      log("vma - found region to free at 0x%.16llx\n", (uint64_t)region);
-      break;
+static void __vma_free_region(vma_ctx_t *ctx, vma_region_t *target) {
+    for (uint64_t i = 0; i < target->length; i++) {
+        uint64_t vaddr = target->start + (i * PMM_PAGE_SIZE);
+        uint64_t paddr = pg_physical(ctx->pm, vaddr);
+        pg_unmap(ctx->pm, vaddr);
+        pmm_free_page((void*)paddr);
     }
-    region = region->next;
-  }
 
-  if (region == NULL) {
-    log("vma - unable to find region to free at address 0x%.16llx\n",
-        (uint64_t)ptr);
-    return;
-  }
-
-  vma_region_t *prev = region->prev;
-  vma_region_t *next = region->next;
-
-  for (uint64_t i = 0; i < region->size; i++) {
-    uint64_t virt = region->start + i * PMM_PAGE_SIZE;
-    uint64_t phys = virt_to_phys(vmm_kernel_pm, virt);
-
-    if (phys != 0) {
-      pmm_free_page((void *)phys);
-      vmm_unmap(ctx->pagemap, virt);
-    }
-  }
-
-  if (prev != NULL) {
-    prev->next = next;
-  }
-
-  if (next != NULL) {
-    next->prev = prev;
-  }
-
-  if (region == ctx->root) {
-    ctx->root = next;
-  }
-
-  pmm_free_page((void *)PHYSICAL(region));
+    pmm_free_page((void*)physical((uint64_t)target));
 }
+
+void vma_free(vma_ctx_t *ctx, void *addr) {
+    if (!ctx || !ctx->pm || !ctx->root || !addr)
+        return;
+
+    vma_region_t *last = NULL;
+    vma_region_t *target = ctx->root;
+
+    while (target) {
+        if (target->start == (uint64_t)addr)
+            break;
+
+        last   = target;
+        target = target->next;
+    }
+
+    if (!target)
+        return;
+
+    if (last)
+        last->next = target->next;
+    else
+        ctx->root = target->next;
+
+    // Unallocate the memory
+    __vma_free_region(ctx, target);
+}
+
+void vma_free_ctx(vma_ctx_t *ctx) {
+    if (!ctx      ||
+        !ctx->pm  ||
+        !ctx->root)
+        return;
+
+    vma_region_t *reg = ctx->root;
+    while (reg) {
+        vma_region_t *next = reg->next;
+        __vma_free_region(ctx, reg);
+        reg = next;
+    }
+
+    pmm_free_page((void*)physical((uint64_t)ctx));
+}
\ No newline at end of file
diff --git a/kernel/src/mm/vma.h b/kernel/src/mm/vma.h
old mode 100644
new mode 100755
index d77d22e..3b6e123
--- a/kernel/src/mm/vma.h
+++ b/kernel/src/mm/vma.h
@@ -1,29 +1,31 @@
-// credit to kevin for writing the vma
-// go check his projects: https://github.com/kevinalavik
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  vma.h - Virtual memory allocator
+ */
 
 #pragma once
 
-#include <mm/pmm.h>
-#include <mm/vmm.h>
-#include <stdint.h>
+#include "mm/paging.h"
+#include <stddef.h>
 
-typedef struct vma_region {
-  uint64_t start;
-  uint64_t size;
-  uint64_t flags;
-  struct vma_region *next;
-  struct vma_region *prev;
+typedef struct __vma_region {
+    uint64_t start;
+    uint64_t pflags;
+
+    // Length is in pages, not in bytes.
+    uint64_t length;
+
+    struct __vma_region *next;
 } vma_region_t;
 
-typedef struct vma_context {
-  pagemap_t *pagemap;
-  vma_region_t *root;
-} vma_context_t;
+typedef struct {
+    pagemap_t pm;
+    vma_region_t *root;
+} vma_ctx_t;
 
-extern vma_context_t *kernel_vma_context;
-
-vma_context_t *vma_create_context(pagemap_t *pagemap);
-void vma_destroy_context(vma_context_t *ctx);
-void *vma_alloc(vma_context_t *ctx, uint64_t size, uint64_t flags);
-void vma_free(vma_context_t *ctx, void *ptr);
-void vma_dump_context(vma_context_t *ctx);
\ No newline at end of file
+vma_ctx_t *vma_alloc_ctx(pagemap_t pm, uint64_t start);
+void      *vma_alloc(vma_ctx_t *ctx, size_t length, uint64_t flags);
+void       vma_free(vma_ctx_t *ctx, void *addr);
+void       vma_free_ctx (vma_ctx_t *ctx);
\ No newline at end of file
diff --git a/kernel/src/mm/vmm.c b/kernel/src/mm/vmm.c
deleted file mode 100644
index e2a183f..0000000
--- a/kernel/src/mm/vmm.c
+++ /dev/null
@@ -1,244 +0,0 @@
-#include "mm/vmm.h"
-#include "limine.h"
-#include "mm/memop.h"
-#include "mm/pmm.h"
-#include "sys/log.h"
-#include "vmm.h"
-#include <stdbool.h>
-#include <stddef.h>
-
-__attribute__((
-    used,
-    section(
-        ".limine_requests"))) static volatile struct limine_paging_mode_request
-    pmrq = {.id = LIMINE_PAGING_MODE_REQUEST,
-            .revision = 3,
-            .mode = LIMINE_PAGING_MODE_X86_64_4LVL};
-
-__attribute__((used, section(".limine_requests"))) static volatile struct
-    limine_executable_address_request karq = {
-        .id = LIMINE_EXECUTABLE_ADDRESS_REQUEST,
-        .revision = 0,
-};
-
-pagemap_t *vmm_kernel_pm = NULL;
-pagemap_t *vmm_current_pm = NULL;
-int vmm_kernel_pm_exists = 0;
-
-pagemap_t *vmm_alloc_pm() {
-  pagemap_t *pm = (pagemap_t *)HIGHER_HALF((uint64_t)pmm_request_page());
-  memset(pm, 0, PMM_PAGE_SIZE);
-
-  pm->toplevel = (uint64_t *)HIGHER_HALF((uint64_t)pmm_request_page());
-  memset(pm->toplevel, 0, PMM_PAGE_SIZE);
-
-  if (vmm_kernel_pm_exists) {
-    for (int i = 256; i < 512; i++) {
-      pm->toplevel[i] = vmm_kernel_pm->toplevel[i];
-    }
-  }
-
-  return pm;
-}
-
-void vmm_release_pm(pagemap_t *pm) {
-  memset(pm->toplevel, 0, PMM_PAGE_SIZE);
-  memset(pm, 0, PMM_PAGE_SIZE);
-  pmm_free_page(pm->toplevel);
-  pmm_free_page(pm);
-}
-
-void vmm_sanity_check() {
-  uint64_t *my_memory = pmm_request_page();
-  *my_memory = 0x40;
-
-  pagemap_t *pm = vmm_alloc_pm();
-  vmm_map(pm, 0x1000, (uint64_t)my_memory, VMM_PRESENT | VMM_WRITABLE);
-
-  uint64_t *my_ptr = (uint64_t *)0x1000;
-  uint64_t ptr_val = 0;
-  vmm_load_pagemap(pm);
-  ptr_val = *my_ptr;
-  vmm_load_pagemap(vmm_kernel_pm);
-
-  if (ptr_val != 0x40) {
-    log("vmm - sanity check failed. system halted.\n");
-    asm("cli");
-    while (1)
-      asm("hlt");
-  }
-}
-
-void vmm_init() {
-  if (pmrq.response->mode != LIMINE_PAGING_MODE_X86_64_4LVL) {
-    log("vmm - Soaplin only supports 4-level paging!\n");
-    asm("cli; hlt;");
-  }
-  vmm_kernel_pm = vmm_alloc_pm();
-  vmm_kernel_pm_exists = 1;
-
-  uint64_t kphysaddr = karq.response->physical_base;
-  uint64_t kvirtaddr = karq.response->virtual_base;
-
-  uint64_t reqs_start = ALIGN_DOWN((uint64_t)reqs_start_ld, PMM_PAGE_SIZE);
-  uint64_t reqs_end = ALIGN_UP((uint64_t)reqs_end_ld, PMM_PAGE_SIZE);
-  uint64_t text_start = ALIGN_DOWN((uint64_t)text_start_ld, PMM_PAGE_SIZE);
-  uint64_t text_end = ALIGN_UP((uint64_t)text_end_ld, PMM_PAGE_SIZE);
-  uint64_t rodata_start = ALIGN_DOWN((uint64_t)rodata_start_ld, PMM_PAGE_SIZE);
-  uint64_t rodata_end = ALIGN_UP((uint64_t)rodata_end_ld, PMM_PAGE_SIZE);
-  uint64_t data_start = ALIGN_DOWN((uint64_t)data_start_ld, PMM_PAGE_SIZE);
-  uint64_t data_end = ALIGN_UP((uint64_t)data_end_ld, PMM_PAGE_SIZE);
-
-  log("vmm - mapping .requests section...\n");
-  for (uint64_t req = reqs_start; req < reqs_end; req += PMM_PAGE_SIZE) {
-    vmm_map(vmm_kernel_pm, req, req - kvirtaddr + kphysaddr,
-            VMM_PRESENT | VMM_WRITABLE);
-  }
-
-  log("vmm - mapping .text section...\n");
-  for (uint64_t text = text_start; text < text_end; text += PMM_PAGE_SIZE) {
-    vmm_map(vmm_kernel_pm, text, text - kvirtaddr + kphysaddr, VMM_PRESENT);
-  }
-
-  log("vmm - mapping .rodata section...\n");
-  for (uint64_t roData = rodata_start; roData < rodata_end;
-       roData += PMM_PAGE_SIZE)
-    vmm_map(vmm_kernel_pm, roData, roData - kvirtaddr + kphysaddr,
-            VMM_PRESENT | VMM_NX);
-
-  log("vmm - mapping .data section...\n");
-  for (uint64_t data = data_start; data < data_end; data += PMM_PAGE_SIZE)
-    vmm_map(vmm_kernel_pm, data, data - kvirtaddr + kphysaddr,
-            VMM_PRESENT | VMM_WRITABLE | VMM_NX);
-
-  log("vmm - mapping address from 0x0 to 0x100000000...\n");
-  for (uint64_t gb4 = 0; gb4 < 0x100000000; gb4 += PMM_PAGE_SIZE) {
-    vmm_map(vmm_kernel_pm, gb4, gb4, VMM_PRESENT | VMM_WRITABLE);
-    vmm_map(vmm_kernel_pm, (uint64_t)HIGHER_HALF(gb4), gb4,
-            VMM_PRESENT | VMM_WRITABLE);
-  }
-
-  vmm_load_pagemap(vmm_kernel_pm);
-
-  vmm_sanity_check();
-  log("vmm - initialized!\n");
-}
-
-void vmm_load_pagemap(pagemap_t *pm) {
-  if (!pm)
-    return;
-
-  if (!pm->toplevel)
-    return;
-
-  vmm_current_pm = pm;
-  __asm__ volatile("mov %0, %%cr3" : : "r"(PHYSICAL(pm->toplevel)) : "memory");
-}
-
-static uint64_t *__vmm_get_next_lvl(uint64_t *level, uint64_t entry,
-                                    uint64_t flags, bool alloc) {
-  if (level[entry] & VMM_PRESENT)
-    return HIGHER_HALF(PTE_GET_ADDR(level[entry]));
-  if (alloc) {
-    uint64_t *pml = (uint64_t *)HIGHER_HALF(pmm_request_page());
-    memset(pml, 0, PMM_PAGE_SIZE);
-    level[entry] = (uint64_t)PHYSICAL(pml) | flags;
-    return pml;
-  }
-  return NULL;
-}
-
-uint64_t vmm_get_flags(pagemap_t *pm, uint64_t vaddr) {
-  uint64_t pml4_entry = (vaddr >> 39) & 0x1ff;
-  uint64_t pml3_entry = (vaddr >> 30) & 0x1ff;
-  uint64_t pml2_entry = (vaddr >> 21) & 0x1ff;
-  uint64_t pml1_entry = (vaddr >> 12) & 0x1ff;
-
-  uint64_t *pml3 = __vmm_get_next_lvl(pm->toplevel, pml4_entry, 0, false);
-  if (!pml3)
-    return 0;
-  uint64_t *pml2 = __vmm_get_next_lvl(pml3, pml3_entry, 0, false);
-  if (!pml2)
-    return 0;
-  uint64_t *pml1 = __vmm_get_next_lvl(pml2, pml2_entry, 0, false);
-  if (!pml1)
-    return 0;
-
-  return pml1[pml1_entry] & 0x7000000000000FFF;
-}
-
-uint64_t virt_to_phys(pagemap_t *pagemap, uint64_t virt) {
-  uint64_t pml4_idx = (virt >> 39) & 0x1FF;
-  uint64_t pml3_idx = (virt >> 30) & 0x1FF;
-  uint64_t pml2_idx = (virt >> 21) & 0x1FF;
-  uint64_t pml1_idx = (virt >> 12) & 0x1FF;
-
-  uint64_t *pml3 = __vmm_get_next_lvl(pagemap->toplevel, pml4_idx, 0, false);
-  if (!pml3)
-    return 0;
-  uint64_t *pml2 = __vmm_get_next_lvl(pml3, pml3_idx, 0, false);
-  if (!pml2)
-    return 0;
-  uint64_t *pml1 = __vmm_get_next_lvl(pml2, pml2_idx, 0, false);
-  if (!pml1)
-    return 0;
-
-  uint64_t phys_addr = pml1[pml1_idx] & 0x000FFFFFFFFFF000;
-
-  return phys_addr;
-}
-
-void vmm_map(pagemap_t *pm, uint64_t vaddr, uint64_t paddr, uint64_t flags) {
-  uint64_t pml4_entry = (vaddr >> 39) & 0x1ff;
-  uint64_t pml3_entry = (vaddr >> 30) & 0x1ff;
-  uint64_t pml2_entry = (vaddr >> 21) & 0x1ff;
-  uint64_t pml1_entry = (vaddr >> 12) & 0x1ff;
-
-  uint64_t *pml3 = __vmm_get_next_lvl(pm->toplevel, pml4_entry,
-                                      VMM_PRESENT | VMM_WRITABLE, true);
-  uint64_t *pml2 =
-      __vmm_get_next_lvl(pml3, pml3_entry, VMM_PRESENT | VMM_WRITABLE, true);
-  uint64_t *pml1 =
-      __vmm_get_next_lvl(pml2, pml2_entry, VMM_PRESENT | VMM_WRITABLE, true);
-
-  pml1[pml1_entry] = paddr | flags;
-}
-
-void vmm_map_user(pagemap_t *pm, uint64_t vaddr, uint64_t paddr,
-                  uint64_t flags) {
-  uint64_t pml4_entry = (vaddr >> 39) & 0x1ff;
-  uint64_t pml3_entry = (vaddr >> 30) & 0x1ff;
-  uint64_t pml2_entry = (vaddr >> 21) & 0x1ff;
-  uint64_t pml1_entry = (vaddr >> 12) & 0x1ff;
-
-
-  uint64_t *pml3 = __vmm_get_next_lvl(pm->toplevel, pml4_entry, flags | VMM_WRITABLE,
-                         true); // PML3 / Page Directory Pointer Entry
-  uint64_t *pml2 = __vmm_get_next_lvl(pml3, pml3_entry, flags | VMM_WRITABLE,
-                                      true); // PML2 / Page Directory Entry
-  uint64_t *pml1 = __vmm_get_next_lvl(pml2, pml2_entry, flags | VMM_WRITABLE,
-                                      true); // PML1 / Page Table Entry
-
-  pml1[pml1_entry] = paddr | flags;
-}
-
-void vmm_unmap(pagemap_t *pm, uint64_t vaddr) {
-  uint64_t pml1_entry = (vaddr >> 12) & 0x1ff;
-  uint64_t pml2_entry = (vaddr >> 21) & 0x1ff;
-  uint64_t pml3_entry = (vaddr >> 30) & 0x1ff;
-  uint64_t pml4_entry = (vaddr >> 39) & 0x1ff;
-
-  uint64_t *pml3 = __vmm_get_next_lvl(pm->toplevel, pml4_entry, 0, false);
-  if (pml3 == NULL)
-    return;
-  uint64_t *pml2 = __vmm_get_next_lvl(pml3, pml3_entry, 0, false);
-  if (pml2 == NULL)
-    return;
-  uint64_t *pml1 = __vmm_get_next_lvl(pml2, pml2_entry, 0, false);
-  if (pml1 == NULL)
-    return;
-
-  pml1[pml1_entry] = 0;
-
-  __asm__ volatile("invlpg (%0)" : : "b"(vaddr) : "memory");
-}
\ No newline at end of file
diff --git a/kernel/src/mm/vmm.h b/kernel/src/mm/vmm.h
deleted file mode 100644
index 12566bc..0000000
--- a/kernel/src/mm/vmm.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-#define PTE_ADDR_MASK 0x000ffffffffff000
-#define PTE_GET_ADDR(VALUE) ((VALUE) & PTE_ADDR_MASK)
-#define PTE_GET_FLAGS(VALUE) ((VALUE) & ~PTE_ADDR_MASK)
-
-#define VMM_PRESENT (1 << 0)
-#define VMM_WRITABLE (1 << 1)
-#define VMM_USER (1 << 2)
-#define VMM_NX (1ULL << 63)
-
-typedef char sym[];
-
-extern sym reqs_start_ld;
-extern sym reqs_end_ld;
-
-extern sym text_start_ld;
-extern sym text_end_ld;
-
-extern sym rodata_start_ld;
-extern sym rodata_end_ld;
-
-extern sym data_start_ld;
-extern sym data_end_ld;
-
-typedef struct pagemap {
-  uint64_t *toplevel;
-} pagemap_t;
-
-extern pagemap_t *vmm_kernel_pm;
-extern pagemap_t *vmm_current_pm;
-
-pagemap_t *vmm_alloc_pm();
-void vmm_init();
-void vmm_release_pm(pagemap_t *pm);
-void vmm_load_pagemap(pagemap_t *pm);
-uint64_t vmm_get_flags(pagemap_t *pm, uint64_t vaddr);
-uint64_t virt_to_phys(pagemap_t *pagemap, uint64_t virt);
-
-// NOTE: for user mode, please use vmm_map_user instead.
-void vmm_map(pagemap_t *pm, uint64_t vaddr, uint64_t paddr, uint64_t flags);
-void vmm_map_user(pagemap_t *pm, uint64_t vaddr, uint64_t paddr,
-                  uint64_t flags);
-void vmm_unmap(pagemap_t *pm, uint64_t vaddr);
\ No newline at end of file
diff --git a/kernel/src/exec/elf.h b/kernel/src/proc/exec/elf.h
old mode 100644
new mode 100755
similarity index 78%
rename from kernel/src/exec/elf.h
rename to kernel/src/proc/exec/elf.h
index 8180a8e..8870c54
--- a/kernel/src/exec/elf.h
+++ b/kernel/src/proc/exec/elf.h
@@ -1,6 +1,12 @@
+/*
+ *  The Soaplin Kernel
+ *  Copyright (C) 2025 The SILD Project
+ *
+ *  elf.h - ELF definitions
+ */
+
 #pragma once
 
-#include "exec/exec.h"
 #include <stdint.h>
 
 // ELF magic.
@@ -94,6 +100,8 @@ typedef struct {
   uint16_t e_shstrndx;
 } Elf64_Ehdr;
 
+#define SHN_UNDEF 0
+
 #define PT_NULL 0
 #define PT_LOAD 1
 #define PT_DYNAMIC 2
@@ -116,10 +124,27 @@ typedef struct {
   uint64_t p_align;
 } Elf64_Phdr;
 
+#define SHT_SYMTAB          2    
+#define SHT_STRTAB          3
+
 typedef struct {
-  program_t program;
+  uint32_t st_name;
+  unsigned char st_info;
+  unsigned char st_other;
+  uint16_t st_shndx;
+  Elf64_Addr st_value;
+  uint64_t st_size;
+} Elf64_Sym;
 
-  Elf64_Ehdr *ehdr;
-} elf_program_t;
-
-program_t *elf_load(char *data, int user);
\ No newline at end of file
+typedef struct {
+  uint32_t sh_name;
+  uint32_t sh_type;
+  uint64_t sh_flags;
+  Elf64_Addr sh_addr;
+  Elf64_Off sh_offset;
+  uint64_t sh_size;
+  uint32_t sh_link;
+  uint32_t sh_info;
+  uint64_t sh_addralign;
+  uint64_t sh_entsize;
+} Elf64_Shdr;
diff --git a/kernel/src/proc/exec/exec.h b/kernel/src/proc/exec/exec.h
new file mode 100644
index 0000000..2901de9
--- /dev/null
+++ b/kernel/src/proc/exec/exec.h
@@ -0,0 +1,30 @@
+
+// Structure for an executable program loaded into memory.
+
+#include "mm/paging.h"
+#include <stddef.h>
+
+typedef enum {
+    EXEC_FMT_ELF,
+    EXEC_FMT_PE,
+    EXEC_FMT_MACHO,
+    EXEC_FMT_SCRIPT
+} exec_format_t;
+
+typedef struct exec {
+    pagemap_t pm;
+
+    void *rwdata_start;
+    size_t rwdata_len;
+
+    uint64_t entry;
+
+    int argc;    // 0 for useds
+    char **argv; // NULL when the executable is a used
+
+    char *path;
+    exec_format_t format;
+
+    size_t usecount; // -1 for users, else, the number of processes sharing the executable's read only sections
+    struct exec *used; // The reference executable.
+} exec_t;
\ No newline at end of file
diff --git a/kernel/src/proc/sched.c b/kernel/src/proc/sched.c
new file mode 100644
index 0000000..680fa12
--- /dev/null
+++ b/kernel/src/proc/sched.c
@@ -0,0 +1,3 @@
+void sched_init() {
+    
+}
\ No newline at end of file
diff --git a/kernel/src/proc/sched.h b/kernel/src/proc/sched.h
new file mode 100644
index 0000000..e30a605
--- /dev/null
+++ b/kernel/src/proc/sched.h
@@ -0,0 +1,69 @@
+#pragma once
+
+#include "arch/x86_64/idt.h"
+#include "mm/paging.h"
+#include <stddef.h>
+#include <proc/exec/exec.h>
+
+struct process;
+
+typedef enum thread_state {
+    THREAD_READY,
+    THREAD_RUNNING,
+    THREAD_BLOCKED,
+    THREAD_TERMINATED
+} thread_state_t;
+
+typedef enum process_type {
+    PT_USER,
+    PT_KERNEL
+} process_type_t;
+
+typedef enum process_state {
+    PS_ZOMBIE,
+    PS_ACTIVE,
+    PS_TERMINATED
+} process_state_t;
+
+typedef struct thread {
+    size_t tid;
+    registers_t regs;
+    uint64_t stack_base;
+    uint64_t stack_end;
+    thread_state_t state;
+
+    struct process *parent;
+
+    // Local only: Only lists the process' threads
+    struct thread  *next;
+    struct thread  *prev; 
+} thread_t;
+
+// Global thread list
+typedef struct thread_list {
+    struct thread *next;
+    struct thread *prev;
+} thread_list_t;
+
+typedef struct process {
+    char *name;
+    size_t pid;
+    pagemap_t pm;
+    thread_t *threads;
+    exec_t *exec_clone;
+    process_type_t type;
+    process_state_t state;
+
+    struct process *next_sibling;
+    struct process *prev_sibling;
+
+    struct process *children;
+    struct process *parent;
+} process_t;
+
+extern thread_t *current_thread;
+extern process_t *current_process;
+extern thread_list_t *thread_list_head;
+
+void sched_init();
+void schedule();
\ No newline at end of file
diff --git a/kernel/src/sched/sched.c b/kernel/src/sched/sched.c
deleted file mode 100644
index 907f83a..0000000
--- a/kernel/src/sched/sched.c
+++ /dev/null
@@ -1,169 +0,0 @@
-#include "sched/sched.h"
-#include "mm/memop.h"
-#include "mm/pmm.h"
-#include "mm/vmm.h"
-#include "sys/arch/x86_64/idt.h"
-#include "sys/log.h"
-#include <stddef.h>
-
-sched_process *proc_list;
-sched_process *curr_proc;
-int current_pid = 0;
-int standby = 0;
-
-void map_range_to_pagemap(pagemap_t *dest_pagemap, pagemap_t *src_pagemap,
-                          uint64_t start, uint64_t size, int user,
-                          uint64_t flags) {
-  for (uint64_t offset = 0; offset < size; offset += PMM_PAGE_SIZE) {
-    uint64_t phys = virt_to_phys(src_pagemap, start + offset);
-    if (phys) {
-      if (user)
-        vmm_map_user(dest_pagemap, start + offset, phys, flags);
-      else
-        vmm_map(dest_pagemap, start + offset, phys, flags);
-    }
-  }
-}
-
-void sched_init() {
-  // TODO: It may be good to implement heap memory to save space.
-
-  // We must initialize the process list.
-  // By default, sched_create will append to this list.
-  proc_list = pmm_request_page();
-  memcpy(proc_list->name, "System\0", 7);
-  proc_list->pid = -1;
-  proc_list->type = SCHED_EMPTY;
-  proc_list->flags = SCHED_KERNEL_PROCESS;
-  proc_list->pm = vmm_kernel_pm;
-
-  curr_proc = proc_list;
-
-  standby = 1;
-  log("sched - As there's nothing "
-      "to schedule, the scheduler entered standby"
-      "mode.\n");
-}
-
-sched_process *sched_create(char *name, uint64_t entry_point, pagemap_t *pm,
-                            uint32_t flags) {
-  // TODO: implement a separate strlen function
-  // as there's like 4 strlen impls in the kernel.
-  int i = 0;
-  while (name[i] != 0)
-    i++;
-
-  sched_process *proc = pmm_request_page();
-  memset(proc, 0, sizeof(sched_process));
-
-  memcpy(proc->name, name, i);
-  proc->pid = current_pid;
-  proc->type = SCHED_RUNNING;
-  proc->flags = flags;
-
-  // We are about to setup the registers ourself.
-  // If it's broken, it's a boom in the ass of your computer
-  // (and a CPU exception)
-
-  proc->pm = pm;
-
-  uint64_t *stack_phys = pmm_request_page();
-  uint64_t *stack_virt = (uint64_t *)0x40000000;
-
-  if (flags == SCHED_KERNEL_PROCESS) {
-    proc->stack_base = stack_phys;
-    proc->stack_base_physical = stack_phys;
-    proc->stack_end = proc->stack_base + PMM_PAGE_SIZE;
-  } else if (flags == SCHED_USER_PROCESS) {
-    vmm_map_user(proc->pm, (uint64_t)stack_virt, (uint64_t)stack_phys,
-                 VMM_PRESENT | VMM_WRITABLE | VMM_USER);
-    proc->stack_base = stack_virt;
-    proc->stack_base_physical = stack_phys;
-    proc->stack_end = proc->stack_base + PMM_PAGE_SIZE;
-  }
-  proc->regs.rip = (uint64_t)entry_point;
-
-  if (flags == SCHED_KERNEL_PROCESS) {
-    proc->regs.cs = 0x28; // Run in kernel mode
-    proc->regs.ss = 0x30;
-  } else if (flags == SCHED_USER_PROCESS) {
-    proc->regs.cs = 0x38 | 3; // Run in user mode
-    proc->regs.ss = 0x40 | 3;
-  }
-  proc->regs.rflags = 0x202; // Enable interrupts
-  proc->regs.rsp = (uint64_t)proc->stack_end;
-  proc->regs.rbp = 0;
-
-  proc->next = curr_proc->next;
-  curr_proc->next = proc;
-
-  current_pid++;
-
-  if (flags == SCHED_USER_PROCESS)
-    map_range_to_pagemap(pm, vmm_kernel_pm, 0x1000, 0x10000, 1,
-                         VMM_PRESENT | VMM_WRITABLE | VMM_USER);
-  else
-    map_range_to_pagemap(pm, vmm_kernel_pm, 0x1000, 0x10000, 0,
-                         VMM_PRESENT | VMM_WRITABLE);
-
-  if (standby) {
-    // Disable standby mode as there's actually something to
-    // run, now.
-    standby = 0;
-    log("sched - Standby mode has been"
-        "disabled.\n");
-  }
-
-  log("sched - created process '%s' (pid: %d, rip: %p)\n", proc->name,
-      proc->pid, proc->regs.rip);
-  return proc;
-}
-
-void sched_exit(int exit_code) {
-  log("sched - Process %d exited with code %d!", curr_proc->pid, exit_code);
-  curr_proc->type = SCHED_DIED;
-  schedule(&curr_proc->regs);
-}
-
-void schedule(registers_t *regs) {
-  if (standby) {
-    // log("sched - Sched is in standby.\n");
-    return;
-  }
-
-  memcpy(&curr_proc->regs, regs, sizeof(registers_t));
-
-  if (curr_proc->type == SCHED_DIED) {
-    sched_process *prev_proc = proc_list;
-    while (prev_proc->next != curr_proc) {
-      prev_proc = prev_proc->next;
-    }
-
-    prev_proc->next = curr_proc->next;
-
-    // Now, it is safe to free the process's memory.
-    vmm_release_pm(curr_proc->pm);
-    pmm_free_page(curr_proc->stack_base_physical);
-
-    // R.I.P. process
-    pmm_free_page(curr_proc);
-
-    return;
-  }
-
-  curr_proc = curr_proc->next;
-  if (curr_proc == NULL)
-    curr_proc = proc_list;
-
-  //log("sched - I choosed process %d\n", curr_proc->pid);
-
-  //log("sched - I choosed process %d (pm: %s, rip: %p)\n", curr_proc->pid, curr_proc->pm == vmm_kernel_pm ? "kernel" : "user", curr_proc->regs.rip);
-  memcpy(regs, &curr_proc->regs, sizeof(registers_t));
-
-  // Finally, load our pagemap
-  // if (memcmp(curr_proc->name, "Init", 4)== 0) {
-  vmm_load_pagemap(curr_proc->pm);
-  // asm("cli");
-  // while (1)
-  //     asm("hlt");}
-}
\ No newline at end of file
diff --git a/kernel/src/sched/sched.h b/kernel/src/sched/sched.h
deleted file mode 100644
index f328d7a..0000000
--- a/kernel/src/sched/sched.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#pragma once
-
-#include "mm/vmm.h"
-#include "sys/arch/x86_64/idt.h"
-
-#define SCHED_KERNEL_PROCESS 0 // A process that runs in kernel mode.
-#define SCHED_USER_PROCESS                                                     \
-  1 // A process that runs in userspace. The code MUST be mapped directly after
-    // creating the process.
-
-typedef enum { SCHED_RUNNING, SCHED_DIED, SCHED_EMPTY } sched_proc_type;
-
-typedef struct _sched_process {
-  char name[128];
-  int pid;
-  int type;
-  int flags;
-
-  registers_t regs;
-  pagemap_t *pm;
-
-  uint64_t *stack_end;
-  uint64_t *stack_base;
-  uint64_t *stack_base_physical;
-
-  struct _sched_process *next;
-} sched_process;
-
-extern sched_process *curr_proc;
-extern sched_process *proc_list;
-
-// The idle process is ditched in favor of standby mode,
-// which activates when there's nothing to run.
-// extern sched_process *idle_process;
-
-void sched_init();
-sched_process *sched_create(char *name, uint64_t entry_point, pagemap_t *pm,
-                            uint32_t flags);
-void sched_exit(int exit_code);
-void schedule(registers_t *regs);
\ No newline at end of file
diff --git a/kernel/src/sys/acpi.c b/kernel/src/sys/acpi.c
deleted file mode 100644
index 6c056ae..0000000
--- a/kernel/src/sys/acpi.c
+++ /dev/null
@@ -1,95 +0,0 @@
-#include "limine.h"
-#include "mm/pmm.h"
-#include "sys/log.h"
-#include <mm/memop.h>
-#include <stddef.h>
-#include <sys/acpi.h>
-
-__attribute__((
-    used,
-    section(".limine_requests"))) static volatile struct limine_rsdp_request
-    rsdp_req = {.revision = 0, .id = LIMINE_RSDP_REQUEST};
-
-rsdp_t *rsdp;
-int acpi_available = 0;
-
-int is_xsdt = 0;
-xsdt_t *xsdt;
-rsdt_t *rsdt;
-int item_count = 0;
-
-static int acpi_validate_rsdp(char *byte_array, size_t size) {
-  uint32_t sum = 0;
-  for (int i = 0; i < size; i++) {
-    sum += byte_array[i];
-  }
-  return (sum & 0xFF) == 0;
-}
-
-void *acpi_find_table(char *sign, int sign_size) {
-  if (!acpi_available)
-    return NULL;
-
-  if (is_xsdt) {
-    for (int i = 0; i < item_count; i++) {
-      uint64_t *lst =
-          (uint64_t *)HIGHER_HALF((uint64_t)xsdt->PointerToOtherSDT);
-      acpi_table_header_t *ptr = (acpi_table_header_t *)HIGHER_HALF(lst[i]);
-
-      if (!memcmp(ptr->Signature, sign, sign_size))
-        return (void *)ptr;
-    }
-  } else {
-    for (int i = 0; i < item_count; i++) {
-      acpi_table_header_t *ptr = (acpi_table_header_t *)HIGHER_HALF(
-          (uint64_t)rsdt->PointerToOtherSDT[i]);
-      if (!memcmp(ptr->Signature, sign, sign_size))
-        return (void *)ptr;
-    }
-  }
-
-  return NULL;
-}
-
-void acpi_init() {
-  rsdp_t *rsdp = (rsdp_t *)HIGHER_HALF(rsdp_req.response->address);
-
-  if (!rsdp) {
-    log("acpi - not available: RSDP is NULL!\n");
-    return;
-  }
-
-  if (rsdp->rev < 2) {
-    if (!acpi_validate_rsdp((char *)rsdp, sizeof(rsdp_t))) {
-      log("acpi - not available: Was the RSDP hijacked?\n");
-      return;
-    }
-    rsdt = (rsdt_t *)HIGHER_HALF((uint64_t)rsdp->rsdt_addr);
-    log("acpi - RSDT found at %p\n", rsdt);
-    item_count = (rsdt->h.Length - sizeof(acpi_table_header_t)) / 4;
-    log("acpi - RSDT contains %d entries\n", item_count);
-  } else {
-    is_xsdt = 1;
-    if (!acpi_validate_rsdp((char *)rsdp, sizeof(xsdp_t))) {
-      log("acpi - not available: Was the XSDP hijacked?\n");
-      return;
-    }
-
-    xsdt = (xsdt_t *)HIGHER_HALF((uint64_t)((xsdp_t *)rsdp)->xsdt_addr);
-    log("acpi - XSDT found at %p\n", xsdt);
-    item_count = (xsdt->h.Length - sizeof(acpi_table_header_t)) / 8;
-    log("acpi - XSDT contains %d entries\n", item_count);
-  }
-
-  acpi_available = 1;
-
-  void *fadt = acpi_find_table("FACP", 4);
-  if (!fadt) {
-    log("acpi - FADT not found\n");
-    acpi_available = 0;
-    return;
-  } else {
-    log("acpi - FADT found at %p\n", fadt);
-    log("acpi - ACPI initialized successfully\n");
-  }
-}
\ No newline at end of file
diff --git a/kernel/src/sys/acpi.h b/kernel/src/sys/acpi.h
deleted file mode 100644
index da28bd6..0000000
--- a/kernel/src/sys/acpi.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-#define ACPI_RSDP_SIGNATURE "RSD PTR "
-#define ACPI_RSDP_SIGNATURE_LEN 7
-
-typedef struct __acpi_table_header {
-  char Signature[4];
-  uint32_t Length;
-  uint8_t Revision;
-  uint8_t Checksum;
-  char OEMID[6];
-  char OEMTableID[8];
-  uint32_t OEMRevision;
-  uint32_t CreatorID;
-  uint32_t CreatorRevision;
-} acpi_table_header_t;
-
-typedef struct __rsdp {
-  char signature[8];
-  uint8_t chksum;
-  char oemid[6];
-  uint8_t rev;
-  uint32_t rsdt_addr;
-} __attribute__((packed)) rsdp_t;
-
-typedef struct __xsdp {
-  char signature[8];
-  uint8_t chksum;
-  char oemid[6];
-  uint8_t rev;
-  uint32_t rsdt_addr; // deprecated since version 2.0
-
-  uint32_t len;
-  uint64_t xsdt_addr;
-  uint8_t chksum_ex;
-  uint8_t reserved[3];
-} __attribute__((packed)) xsdp_t;
-
-typedef struct __rsdt {
-  acpi_table_header_t h;
-  uint32_t *PointerToOtherSDT;
-} rsdt_t;
-
-typedef struct __xsdt {
-  acpi_table_header_t h;
-  uint64_t *PointerToOtherSDT;
-} xsdt_t;
-
-void acpi_init();
\ No newline at end of file
diff --git a/kernel/src/sys/arch/arch.h b/kernel/src/sys/arch/arch.h
deleted file mode 100755
index 284f561..0000000
--- a/kernel/src/sys/arch/arch.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#define ENSURE_X86_64 #ifdef __x86_64__
-
-#define ENDENSURE
\ No newline at end of file
diff --git a/kernel/src/sys/arch/x86_64/cpuid.h b/kernel/src/sys/arch/x86_64/cpuid.h
deleted file mode 100644
index 45a8d5f..0000000
--- a/kernel/src/sys/arch/x86_64/cpuid.h
+++ /dev/null
@@ -1,647 +0,0 @@
-#ifndef __CPUID_H__
-#define __CPUID_H__
-
-#include <stdint.h>
-
-//=================CPUID_VENDOR=================
-#define CPUID_VENDOR_INTEL "GenuineIntel"
-#define CPUID_VENDOR_AMD "AuthenticAMD"
-
-//================CPUID_CPU_INFO================
-#define CPUID_CPU_INFO_EAX_STEPPING_MASK 0xF
-#define CPUID_CPU_INFO_EAX_MODEL_MASK 0xF << 4
-#define CPUID_CPU_INFO_EAX_FAMILY_MASK 0xF << 8
-#define CPUID_CPU_INFO_EAX_TYPE_MASK 0x3 << 12
-#define CPUID_CPU_INFO_EAX_EXT_MODEL_MASK 0xF << 16
-#define CPUID_CPU_INFO_EAX_EXT_FAMILY_MASK 0xFF << 20
-
-#define CPUID_CPU_INFO_EBX_BRAND_INDEX 0xFF
-#define CPUID_CPU_INFO_EBX_CFLUSH_SIZE 0xFF << 8
-#define CPUID_CPU_INFO_EBX_MAX_LOGPROC 0xFF << 16
-#define CPUID_CPU_INFO_EBX_INIT_APIC_ID 0xFF << 25
-
-#define CPUID_CPU_INFO_ECX_SSE3 1 << 0
-#define CPUID_CPU_INFO_ECX_PCLMULQDQ 1 << 1
-#define CPUID_CPU_INFO_ECX_DTES64 1 << 2
-#define CPUID_CPU_INFO_ECX_MONITOR 1 << 3
-#define CPUID_CPU_INFO_ECX_DS_CPL 1 << 4
-#define CPUID_CPU_INFO_ECX_VMX 1 << 5
-#define CPUID_CPU_INFO_ECX_SMX 1 << 6
-#define CPUID_CPU_INFO_ECX_EIST 1 << 7
-#define CPUID_CPU_INFO_ECX_TM2 1 << 8
-#define CPUID_CPU_INFO_ECX_SSSE3 1 << 9
-#define CPUID_CPU_INFO_ECX_CNXT_ID 1 << 10
-#define CPUID_CPU_INFO_ECX_SDBG 1 << 11
-#define CPUID_CPU_INFO_ECX_FMA 1 << 12
-#define CPUID_CPU_INFO_ECX_CMPXCHG16B 1 << 13
-#define CPUID_CPU_INFO_ECX_XTPR_UC 1 << 14
-#define CPUID_CPU_INFO_ECX_PDCM 1 << 15
-// bit 16 is reserved
-#define CPUID_CPU_INFO_ECX_PCID 1 << 17
-#define CPUID_CPU_INFO_ECX_DCA 1 << 18
-#define CPUID_CPU_INFO_ECX_SSE4_1 1 << 19
-#define CPUID_CPU_INFO_ECX_SSE4_2 1 << 20
-#define CPUID_CPU_INFO_ECX_X2APIC 1 << 21
-#define CPUID_CPU_INFO_ECX_MOVBE 1 << 22
-#define CPUID_CPU_INFO_ECX_POPCNT 1 << 23
-#define CPUID_CPU_INFO_ECX_TSC_DEADLINE 1 << 24
-#define CPUID_CPU_INFO_ECX_AESNI 1 << 25
-#define CPUID_CPU_INFO_ECX_XSAVE 1 << 26
-#define CPUID_CPU_INFO_ECX_OSXSAVE 1 << 27
-#define CPUID_CPU_INFO_ECX_AVX 1 << 28
-#define CPUID_CPU_INFO_ECX_F16C 1 << 29
-#define CPUID_CPU_INFO_ECX_RDRAND 1 << 30
-// bit 31 is unused
-
-#define CPUID_CPU_INFO_EDX_FPU 1 << 0
-#define CPUID_CPU_INFO_EDX_VME 1 << 1
-#define CPUID_CPU_INFO_EDX_DE 1 << 2
-#define CPUID_CPU_INFO_EDX_PSE 1 << 3
-#define CPUID_CPU_INFO_EDX_TSC 1 << 4
-#define CPUID_CPU_INFO_EDX_MSR 1 << 5
-#define CPUID_CPU_INFO_EDX_PAE 1 << 6
-#define CPUID_CPU_INFO_EDX_MCE 1 << 7
-#define CPUID_CPU_INFO_EDX_CX8 1 << 8
-#define CPUID_CPU_INFO_EDX_APIC 1 << 9
-// bit 10 is reserved
-#define CPUID_CPU_INFO_EDX_SEP 1 << 11
-#define CPUID_CPU_INFO_EDX_MTRR 1 << 12
-#define CPUID_CPU_INFO_EDX_PGE 1 << 13
-#define CPUID_CPU_INFO_EDX_MCA 1 << 14
-#define CPUID_CPU_INFO_EDX_CMOV 1 << 15
-#define CPUID_CPU_INFO_EDX_PAT 1 << 16
-#define CPUID_CPU_INFO_EDX_PSE_36 1 << 17
-#define CPUID_CPU_INFO_EDX_PSN 1 << 18
-#define CPUID_CPU_INFO_EDX_CLFSH 1 << 19
-// bit 20 is reserved
-#define CPUID_CPU_INFO_EDX_DS 1 << 21
-#define CPUID_CPU_INFO_EDX_ACPI 1 << 22
-#define CPUID_CPU_INFO_EDX_MMX 1 << 23
-#define CPUID_CPU_INFO_EDX_FXSR 1 << 24
-#define CPUID_CPU_INFO_EDX_SSE 1 << 25
-#define CPUID_CPU_INFO_EDX_SSE2 1 << 26
-#define CPUID_CPU_INFO_EDX_SS 1 << 27
-#define CPUID_CPU_INFO_EDX_HTT 1 << 28
-#define CPUID_CPU_INFO_EDX_TM 1 << 29
-// bit 30 is reserved
-#define CPUID_CPU_INFO_EDX_PBE 1 << 31
-
-//===============CPUID_CACHE_TLB===============
-// WARNING: I gave up and used ChatGPT for these
-#define CPUID_CACHE_TLB_DESC_NULL 0x00
-#define CPUID_CACHE_TLB_DESC_TLB_4_KBYTE_4WAY_32E 0x01
-#define CPUID_CACHE_TLB_DESC_TLB_4_MBYTE_FULLY_2E 0x02
-#define CPUID_CACHE_TLB_DESC_DTLB_4_KBYTE_4WAY_64E 0x03
-#define CPUID_CACHE_TLB_DESC_DTLB_4_MBYTE_4WAY_8E 0x04
-#define CPUID_CACHE_TLB_DESC_DTLB1_4_MBYTE_4WAY_32E 0x05
-#define CPUID_CACHE_TLB_DESC_L1_INST_8K_4WAY_32B 0x06
-#define CPUID_CACHE_TLB_DESC_L1_INST_16K_4WAY_32B 0x08
-#define CPUID_CACHE_TLB_DESC_L1_INST_32K_4WAY_64B 0x09
-#define CPUID_CACHE_TLB_DESC_L1_DATA_8K_2WAY_32B 0x0A
-#define CPUID_CACHE_TLB_DESC_TLB_4_MBYTE_4WAY_4E 0x0B
-#define CPUID_CACHE_TLB_DESC_L1_DATA_16K_4WAY_32B 0x0C
-#define CPUID_CACHE_TLB_DESC_L1_DATA_16K_4WAY_64B 0x0D
-#define CPUID_CACHE_TLB_DESC_L1_DATA_24K_6WAY_64B 0x0E
-#define CPUID_CACHE_TLB_DESC_L2_128K_2WAY_64B 0x1D
-#define CPUID_CACHE_TLB_DESC_L2_256K_8WAY_64B 0x21
-#define CPUID_CACHE_TLB_DESC_L3_512K_4WAY_64B_2LPS 0x22
-#define CPUID_CACHE_TLB_DESC_L3_1M_8WAY_64B_2LPS 0x23
-#define CPUID_CACHE_TLB_DESC_L2_1M_16WAY_64B 0x24
-#define CPUID_CACHE_TLB_DESC_L3_2M_8WAY_64B_2LPS 0x25
-#define CPUID_CACHE_TLB_DESC_L3_4M_8WAY_64B_2LPS 0x29
-#define CPUID_CACHE_TLB_DESC_L1_DATA_32K_8WAY_64B 0x2C
-#define CPUID_CACHE_TLB_DESC_L1_INST_32K_8WAY_64B 0x30
-#define CPUID_CACHE_TLB_DESC_NO_L2_OR_L3 0x40
-#define CPUID_CACHE_TLB_DESC_L2_128K_4WAY_32B 0x41
-#define CPUID_CACHE_TLB_DESC_L2_256K_4WAY_32B 0x42
-#define CPUID_CACHE_TLB_DESC_L2_512K_4WAY_32B 0x43
-#define CPUID_CACHE_TLB_DESC_L2_1M_4WAY_32B 0x44
-#define CPUID_CACHE_TLB_DESC_L2_2M_4WAY_32B 0x45
-#define CPUID_CACHE_TLB_DESC_L3_4M_4WAY_64B 0x46
-#define CPUID_CACHE_TLB_DESC_L3_8M_8WAY_64B 0x47
-#define CPUID_CACHE_TLB_DESC_L2_3M_12WAY_64B 0x48
-#define CPUID_CACHE_TLB_DESC_L3_4M_16WAY_64B 0x49
-#define CPUID_CACHE_TLB_DESC_L3_6M_12WAY_64B 0x4A
-#define CPUID_CACHE_TLB_DESC_L3_8M_16WAY_64B 0x4B
-#define CPUID_CACHE_TLB_DESC_L3_12M_12WAY_64B 0x4C
-#define CPUID_CACHE_TLB_DESC_L3_16M_16WAY_64B 0x4D
-#define CPUID_CACHE_TLB_DESC_L2_6M_24WAY_64B 0x4E
-#define CPUID_CACHE_TLB_DESC_TLB_INST_4K_32E 0x4F
-#define CPUID_CACHE_TLB_DESC_TLB_INST_4K_2M_4M_64E 0x50
-#define CPUID_CACHE_TLB_DESC_TLB_INST_4K_2M_4M_128E 0x51
-#define CPUID_CACHE_TLB_DESC_TLB_INST_4K_2M_4M_256E 0x52
-#define CPUID_CACHE_TLB_DESC_TLB_INST_2M_4M_FULLY_7E 0x55
-#define CPUID_CACHE_TLB_DESC_DTLB0_4M_4WAY_16E 0x56
-#define CPUID_CACHE_TLB_DESC_DTLB0_4K_4WAY_16E 0x57
-#define CPUID_CACHE_TLB_DESC_DTLB0_4K_FULLY_16E 0x59
-#define CPUID_CACHE_TLB_DESC_DTLB0_2M_4M_4WAY_32E 0x5A
-#define CPUID_CACHE_TLB_DESC_DTLB_4K_4M_64E 0x5B
-#define CPUID_CACHE_TLB_DESC_DTLB_4K_4M_128E 0x5C
-#define CPUID_CACHE_TLB_DESC_DTLB_4K_4M_256E 0x5D
-#define CPUID_CACHE_TLB_DESC_L1_DATA_16K_8WAY_64B 0x60
-#define CPUID_CACHE_TLB_DESC_TLB_INST_4K_FULLY_48E 0x61
-#define CPUID_CACHE_TLB_DESC_DTLB_2M_4M_32E_1G_4WAY_4E 0x63
-#define CPUID_CACHE_TLB_DESC_DTLB_4K_4WAY_512E 0x64
-#define CPUID_CACHE_TLB_DESC_L1_DATA_8K_4WAY_64B 0x66
-#define CPUID_CACHE_TLB_DESC_L1_DATA_16K_4WAY_64B_DUPLICATE 0x67 //????????????
-#define CPUID_CACHE_TLB_DESC_L1_DATA_32K_4WAY_64B 0x68
-#define CPUID_CACHE_TLB_DESC_UTLB_4K_8WAY_64E 0x6A
-#define CPUID_CACHE_TLB_DESC_DTLB_4K_8WAY_256E 0x6B
-#define CPUID_CACHE_TLB_DESC_DTLB_2M_4M_8WAY_128E 0x6C
-#define CPUID_CACHE_TLB_DESC_DTLB_1G_FULLY_16E 0x6D
-#define CPUID_CACHE_TLB_DESC_TRACE_12K_8WAY 0x70
-#define CPUID_CACHE_TLB_DESC_TRACE_16K_8WAY 0x71
-#define CPUID_CACHE_TLB_DESC_TRACE_32K_8WAY 0x72
-#define CPUID_CACHE_TLB_DESC_TLB_INST_2M_4M_FULLY_8E 0x76
-#define CPUID_CACHE_TLB_DESC_L2_1M_4WAY_64B 0x78
-#define CPUID_CACHE_TLB_DESC_L2_128K_8WAY_64B_2LPS 0x79
-#define CPUID_CACHE_TLB_DESC_L2_256K_8WAY_64B_2LPS 0x7A
-#define CPUID_CACHE_TLB_DESC_L2_512K_8WAY_64B_2LPS 0x7B
-#define CPUID_CACHE_TLB_DESC_L2_1M_8WAY_64B_2LPS 0x7C
-#define CPUID_CACHE_TLB_DESC_L2_2M_8WAY_64B 0x7D
-#define CPUID_CACHE_TLB_DESC_L2_512K_2WAY_64B 0x7F
-#define CPUID_CACHE_TLB_DESC_L2_512K_8WAY_64B 0x80
-#define CPUID_CACHE_TLB_DESC_L2_256K_8WAY_32B 0x82
-#define CPUID_CACHE_TLB_DESC_L2_512K_8WAY_32B 0x83
-#define CPUID_CACHE_TLB_DESC_L2_1M_8WAY_32B 0x84
-#define CPUID_CACHE_TLB_DESC_L2_2M_8WAY_32B 0x85
-#define CPUID_CACHE_TLB_DESC_L2_512K_4WAY_64B 0x86
-#define CPUID_CACHE_TLB_DESC_L2_1M_8WAY_64B 0x87
-#define CPUID_CACHE_TLB_DESC_DTLB_4K_FULLY_ASSOC_32E 0xA0
-#define CPUID_CACHE_TLB_DESC_TLB_INST_4K_4WAY_128E 0xB0
-#define CPUID_CACHE_TLB_DESC_TLB_INST_2M_4WAY_8E_4M_4WAY_4E 0xB1
-#define CPUID_CACHE_TLB_DESC_TLB_INST_4K_4WAY_64E 0xB2
-#define CPUID_CACHE_TLB_DESC_TLB_DATA_4K_4WAY_128E 0xB3
-#define CPUID_CACHE_TLB_DESC_TLB_DATA_4K_4WAY_256E 0xB4
-#define CPUID_CACHE_TLB_DESC_TLB_INST_4K_8WAY_64E 0xB5
-#define CPUID_CACHE_TLB_DESC_TLB_INST_4K_8WAY_128E 0xB6
-#define CPUID_CACHE_TLB_DESC_TLB_DATA_4K_4WAY_64E 0xBA
-#define CPUID_CACHE_TLB_DESC_TLB_DATA_4K_4M_4WAY_8E 0xC0
-#define CPUID_CACHE_TLB_DESC_STLB_2ND_LEVEL_4K_2M_8WAY_1024E 0xC1
-#define CPUID_CACHE_TLB_DESC_DTLB_4K_2M_4WAY_16E 0xC2
-#define CPUID_CACHE_TLB_DESC_STLB_2ND_LEVEL_4K_2M_6WAY_1536E_1GB_4WAY_16E 0xC3
-#define CPUID_CACHE_TLB_DESC_DTLB_2M_4M_4WAY_32E 0xC4
-#define CPUID_CACHE_TLB_DESC_STLB_2ND_LEVEL_4K_4WAY_512E 0xCA
-#define CPUID_CACHE_TLB_DESC_CACHE_3RD_LEVEL_512KB_4WAY_64B_LINE 0xD0
-#define CPUID_CACHE_TLB_DESC_CACHE_3RD_LEVEL_1MB_4WAY_64B_LINE 0xD1
-#define CPUID_CACHE_TLB_DESC_CACHE_3RD_LEVEL_2MB_4WAY_64B_LINE 0xD2
-#define CPUID_CACHE_TLB_DESC_CACHE_3RD_LEVEL_1MB_8WAY_64B_LINE 0xD6
-#define CPUID_CACHE_TLB_DESC_CACHE_3RD_LEVEL_2MB_8WAY_64B_LINE 0xD7
-#define CPUID_CACHE_TLB_DESC_CACHE_3RD_LEVEL_4MB_8WAY_64B_LINE 0xD8
-#define CPUID_CACHE_TLB_DESC_CACHE_3RD_LEVEL_1_5MB_12WAY_64B_LINE 0xDC
-#define CPUID_CACHE_TLB_DESC_CACHE_3RD_LEVEL_3MB_12WAY_64B_LINE 0xDD
-#define CPUID_CACHE_TLB_DESC_CACHE_3RD_LEVEL_6MB_12WAY_64B_LINE 0xDE
-#define CPUID_CACHE_TLB_DESC_CACHE_3RD_LEVEL_2MB_16WAY_64B_LINE 0xE2
-#define CPUID_CACHE_TLB_DESC_CACHE_3RD_LEVEL_4MB_16WAY_64B_LINE 0xE3
-#define CPUID_CACHE_TLB_DESC_CACHE_3RD_LEVEL_8MB_16WAY_64B_LINE 0xE4
-#define CPUID_CACHE_TLB_DESC_CACHE_3RD_LEVEL_12MB_24WAY_64B_LINE 0xEA
-#define CPUID_CACHE_TLB_DESC_CACHE_3RD_LEVEL_18MB_24WAY_64B_LINE 0xEB
-#define CPUID_CACHE_TLB_DESC_CACHE_3RD_LEVEL_24MB_24WAY_64B_LINE 0xEC
-#define CPUID_CACHE_TLB_DESC_PREFETCH_64_BYTE 0xF0
-#define CPUID_CACHE_TLB_DESC_PREFETCH_128_BYTE 0xF1
-#define CPUID_CACHE_TLB_DESC_NO_TLB_INFO_CPUID_LEAF_18H 0xFE
-#define CPUID_CACHE_TLB_DESC_NO_CACHE_INFO_CPUID_LEAF_4 0xFF
-
-//=============CPUID_SERIAL_NUMBER=============
-#define CPUID_SERIAL_NUMBER_STITCH(ECX, EDX) (uint64_t)((EDX << 32) | ECX)
-
-//=============CPUID_CACHE_PARAMS==============
-#define CPUID_CACHE_PARAMS_EAX_CACHE_TYPE 0xF
-#define CPUID_CACHE_PARAMS_EAX_CACHE_LEVEL 0x7 << 4
-#define CPUID_CACHE_PARAMS_EAX_IS_SELF_INIT 1 << 8
-#define CPUID_CACHE_PARAMS_EAX_IS_FULLY_ASSOCIATIVE 1 << 9
-// bits 10-13 are reserved
-#define CPUID_CACHE_PARAMS_EAX_MAX_PROC_SHARING 0xFFF << 14
-
-#define CPUID_CACHE_PARAMS_EAX_CACHE_TYPE_NULL 0x0
-#define CPUID_CACHE_PARAMS_EAX_CACHE_TYPE_DATA 0x1
-#define CPUID_CACHE_PARAMS_EAX_CACHE_TYPE_INSTRUCTION 0x2
-#define CPUID_CACHE_PARAMS_EAX_CACHE_TYPE_UNIFIED 0x3
-
-#define CPUID_CACHE_PARAMS_EBX_COHERENCY_LINE_SIZE 0xFFF
-#define CPUID_CACHE_PARAMS_EBX_PHYS_LINE_PARTITIONS 0x3FF << 12
-#define CPUID_CACHE_PARAMS_EBX_WAYS_OF_ASSOCIVITY 0x3FF
-
-#define CPUID_CACHE_PARAMS_EDX_CACHE_INCLUSIVENESS 1
-#define CPUID_CACHE_PARAMS_EDX_COMPLEX_CACHE_INDEXING 1 << 1
-
-//=============CPUID_MONITOR_MWAIT=============
-#define CPUID_MONITOR_MWAIT_ECX_ENUM_EXTENSIONS 1
-#define CPUID_MONITOR_MWAIT_ECX_BREAK_EVENTS 1 << 1
-
-#define CPUID_MONITOR_MWAIT_EDX_C0_SUBC_STATES 0xF
-#define CPUID_MONITOR_MWAIT_EDX_C1_SUBC_STATES 0xF << 4
-#define CPUID_MONITOR_MWAIT_EDX_C2_SUBC_STATES 0xF << 8
-#define CPUID_MONITOR_MWAIT_EDX_C3_SUBC_STATES 0xF << 12
-#define CPUID_MONITOR_MWAIT_EDX_C4_SUBC_STATES 0xF << 16
-#define CPUID_MONITOR_MWAIT_EDX_C5_SUBC_STATES 0xF << 20
-#define CPUID_MONITOR_MWAIT_EDX_C6_SUBC_STATES 0xF << 24
-#define CPUID_MONITOR_MWAIT_EDX_C7_SUBC_STATES 0xF << 28
-
-//===========CPUID_THERMAL_AND_POWER===========
-#define CPUID_THERMAL_AND_POWER_EAX_TEMP_SENSOR 1
-#define CPUID_THERMAL_AND_POWER_EAX_TURBO_BOOST 1 << 1
-#define CPUID_THERMAL_AND_POWER_EAX_ARAT 1 << 2
-// Bit 3 is reserved
-#define CPUID_THERMAL_AND_POWER_EAX_PLN 1 << 3
-#define CPUID_THERMAL_AND_POWER_EAX_ECMD 1 << 5
-#define CPUID_THERMAL_AND_POWER_EAX_PTM 1 << 6
-#define CPUID_THERMAL_AND_POWER_EAX_HWP 1 << 7
-#define CPUID_THERMAL_AND_POWER_EAX_HWP_NOTIFICATION 1 << 8
-#define CPUID_THERMAL_AND_POWER_EAX_HWP_ACT_WINDOW 1 << 9
-#define CPUID_THERMAL_AND_POWER_EAX_HWP_PERF_PREF 1 << 10
-#define CPUID_THERMAL_AND_POWER_EAX_HWP_PKG_LVL_REQ 1 << 11
-// Bit 12 is reserved
-#define CPUID_THERMAL_AND_POWER_EAX_HDC 1 << 13
-#define CPUID_THERMAL_AND_POWER_EAX_TURBO_BOOST_MAX 1 << 14
-#define CPUID_THERMAL_AND_POWER_EAX_HWP_CAPABILITIES 1 << 15
-#define CPUID_THERMAL_AND_POWER_EAX_HWP_PECI 1 << 16
-#define CPUID_THERMAL_AND_POWER_EAX_FLEXIBLE_HWP 1 << 17
-#define CPUID_THERMAL_AND_POWER_EAX_FAST_HWP_REQUEST 1 << 18
-#define CPUID_THERMAL_AND_POWER_EAX_HW_FEEDBACK 1 << 19
-#define CPUID_THERMAL_AND_POWER_EAX_IGNORE_HWP_IDLE 1 << 20
-// Bits 21 and 22 are reserved
-#define CPUID_THERMAL_AND_POWER_EAX_THREAD_DIRECTOR 1 << 23
-#define CPUID_THERMAL_AND_POWER_EAX_THERM_INTERRUPT 1 << 24
-
-#define CPUID_THERMAL_AND_POWER_EBX_INT_TRESHOLD 0xf
-
-#define CPUID_THERMAL_AND_POWER_ECX_HW_COORD_FEEDBACK 1
-#define CPUID_THERMAL_AND_POWER_ECX_ENERGY_PERF_BIAS 1 << 3
-#define CPUID_THERMAL_AND_POWER_ECX_TD_CLASSES 0xff << 8
-
-#define CPUID_THERMAL_AND_POWER_EDX_PERF_REPORT 1
-#define CPUID_THERMAL_AND_POWER_EDX_EFFICIENCY_REPORT 1 << 1
-#define CPUID_THERMAL_AND_POWER_EDX_HW_FEEDBACK_SIZE 0xf << 8
-#define CPUID_THERMAL_AND_POWER_EDX_THIS_PROC_HW_FB 0xffff << 16
-
-//===========CPUID_EXTENDED_FEATURES===========
-#define CPUID_EXTENDED_FEATURES_EBX_FSGSBASE 1
-#define CPUID_EXTENDED_FEATURES_EBX_TSC_ADJUST 1 << 1
-#define CPUID_EXTENDED_FEATURES_EBX_SGX 1 << 2
-#define CPUID_EXTENDED_FEATURES_EBX_BMI1 1 << 3
-#define CPUID_EXTENDED_FEATURES_EBX_HLE 1 << 4
-#define CPUID_EXTENDED_FEATURES_EBX_AVX2 1 << 5
-#define CPUID_EXTENDED_FEATURES_EBX_FDP_EXCPTN_ONLY 1 << 6
-#define CPUID_EXTENDED_FEATURES_EBX_SMEP 1 << 7
-#define CPUID_EXTENDED_FEATURES_EBX_BMI2 1 << 8
-#define CPUID_EXTENDED_FEATURES_EBX_ENHANCED_REP 1 << 9
-#define CPUID_EXTENDED_FEATURES_EBX_INVCIP 1 << 10
-#define CPUID_EXTENDED_FEATURES_EBX_RTM 1 << 11
-#define CPUID_EXTENDED_FEATURES_EBX_RDT_M 1 << 12
-#define CPUID_EXTENDED_FEATURES_EBX_NO_FPU_CS 1 << 13
-#define CPUID_EXTENDED_FEATURES_EBX_MPX 1 << 14
-#define CPUID_EXTENDED_FEATURES_EBX_RDT_A 1 << 15
-#define CPUID_EXTENDED_FEATURES_EBX_AVX512F 1 << 16
-#define CPUID_EXTENDED_FEATURES_EBX_AVX512DQ 1 << 17
-#define CPUID_EXTENDED_FEATURES_EBX_RDSEED 1 << 18
-#define CPUID_EXTENDED_FEATURES_EBX_ADX 1 << 19
-#define CPUID_EXTENDED_FEATURES_EBX_SMAP 1 << 20
-#define CPUID_EXTENDED_FEATURES_EBX_AVX512_IFMA 1 << 21
-// Bit 22 is reserved
-#define CPUID_EXTENDED_FEATURES_EBX_CLFLUSHOPT 1 << 23
-#define CPUID_EXTENDED_FEATURES_EBX_CLWB 1 << 24
-#define CPUID_EXTENDED_FEATURES_EBX_TRACE 1 << 25
-#define CPUID_EXTENDED_FEATURES_EBX_AVX512PF 1 << 26
-#define CPUID_EXTENDED_FEATURES_EBX_AVX512ER 1 << 27
-#define CPUID_EXTENDED_FEATURES_EBX_AVX512CD 1 << 28
-#define CPUID_EXTENDED_FEATURES_EBX_SHA 1 << 29
-#define CPUID_EXTENDED_FEATURES_EBX_AVX512BW 1 << 30
-#define CPUID_EXTENDED_FEATURES_EBX_AVX512VL 1 << 31
-
-#define CPUID_EXTENDED_FEATURES_ECX_PREFETCHWT1 1
-#define CPUID_EXTENDED_FEATURES_ECX_AFX512_VBMI 1 << 1
-#define CPUID_EXTENDED_FEATURES_ECX_UMIP 1 << 2
-#define CPUID_EXTENDED_FEATURES_ECX_PKU 1 << 3
-#define CPUID_EXTENDED_FEATURES_ECX_OSPKE 1 << 4
-#define CPUID_EXTENDED_FEATURES_ECX_WAITPKG 1 << 5
-#define CPUID_EXTENDED_FEATURES_ECX_AVX512_VBMI2 1 << 6
-#define CPUID_EXTENDED_FEATURES_ECX_CET_SS 1 << 7
-#define CPUID_EXTENDED_FEATURES_ECX_GFNI 1 << 8
-#define CPUID_EXTENDED_FEATURES_ECX_VAES 1 << 9
-#define CPUID_EXTENDED_FEATURES_ECX_VPCLMULQDQ 1 << 10
-#define CPUID_EXTENDED_FEATURES_ECX_AVX512_VNNI 1 << 11
-#define CPUID_EXTENDED_FEATURES_ECX_AVX512_BITLANG 1 << 12
-#define CPUID_EXTENDED_FEATURES_ECX_TME_EN 1 << 13
-#define CPUID_EXTENDED_FEATURES_ECX_AVX512_VPOPVNZDQ 1 << 14
-// bit 15 is reserved
-#define CPUID_EXTENDED_FEATURES_ECX_LA57 1 << 16
-#define CPUID_EXTENDED_FEATURES_ECX_MAWAU_VAL 0x1F << 17
-#define CPUID_EXTENDED_FEATURES_ECX_RDPID 1 << 22
-#define CPUID_EXTENDED_FEATURES_ECX_KL 1 << 23
-#define CPUID_EXTENDED_FEATURES_ECX_BUS_LOCK_DETECT 1 << 24
-#define CPUID_EXTENDED_FEATURES_ECX_CLDEMOTE 1 << 25
-// bit 26 is reserved
-#define CPUID_EXTENDED_FEATURES_ECX_MOVDIRI 1 << 27
-#define CPUID_EXTENDED_FEATURES_ECX_MOVDIR64B 1 << 28
-#define CPUID_EXTENDED_FEATURES_ECX_ENQCMD 1 << 29
-#define CPUID_EXTENDED_FEATURES_ECX_SGX_LC 1 << 30
-#define CPUID_EXTENDED_FEATURES_ECX_PKS 1 << 31
-
-// bit 0 is reserved
-#define CPUID_EXTENDED_FEATURES_EDX_SGX_KEYS 1 << 1
-#define CPUID_EXTENDED_FEATURES_EDX_AVX512_4VNNIW 1 << 2
-#define CPUID_EXTENDED_FEATURES_EDX_AVX512_4FMAPS 1 << 3
-#define CPUID_EXTENDED_FEATURES_EDX_FAST_REP_MOV 1 << 4
-#define CPUID_EXTENDED_FEATURES_EDX_UINTR 1 << 5
-// bits 6 and 7 are reserved
-#define CPUID_EXTENDED_FEATURES_EDX_AVX512_VPINTERSECT                         \
-  1 << 8 // intel you son of a bitch
-#define CPUID_EXTENDED_FEATURES_EDX_SRBDS_CTRL 1 << 9
-#define CPUID_EXTENDED_FEATURES_EDX_MD_CLEAR 1 << 10
-#define CPUID_EXTENDED_FEATURES_EDX_RTM_ALWAYS_ABORT 1 << 11
-// bit 12 is reserved
-#define CPUID_EXTENDED_FEATURES_EDX_RTM_FORCE_ABORT 1 << 13
-#define CPUID_EXTENDED_FEATURES_EDX_SERIALIZE 1 << 14
-#define CPUID_EXTENDED_FEATURES_EDX_HYBRID 1 << 15
-#define CPUID_EXTENDED_FEATURES_EDX_TSXLDTRK 1 << 16
-// bit 17 is reserved
-#define CPUID_EXTENDED_FEATURES_EDX_PCONFIG 1 << 18
-#define CPUID_EXTENDED_FEATURES_EDX_ARCHITECTURAL_LBR 1 << 19
-#define CPUID_EXTENDED_FEATURES_EDX_CET_IBT 1 << 20
-// bit 21 is reserved
-#define CPUID_EXTENDED_FEATURES_EDX_AMX_BF16 1 << 22
-#define CPUID_EXTENDED_FEATURES_EDX_AVX512_FP16 1 << 23
-#define CPUID_EXTENDED_FEATURES_EDX_AMX_TILE 1 << 24
-#define CPUID_EXTENDED_FEATURES_EDX_AMX_INT8 1 << 25
-#define CPUID_EXTENDED_FEATURES_EDX_IBRS 1 << 26
-#define CPUID_EXTENDED_FEATURES_EDX_STIBP 1 << 27
-#define CPUID_EXTENDED_FEATURES_EDX_L1D_FLUSH 1 << 28
-#define CPUID_EXTENDED_FEATURES_EDX_ARCH_CAPABS_MSR 1 << 29
-#define CPUID_EXTENDED_FEATURES_EDX_CORE_CAPABS_MSR 1 << 30
-#define CPUID_EXTENDED_FEATURES_EDX_SSBD 1 << 31
-
-//=========CPUID_EXTENDED_FEATURES_SL1=========
-// bits 0-3 are reserved
-#define CPUID_EXTENDED_FEATURES_SL1_EAX_AVX_VNNI 1 << 4
-#define CPUID_EXTENDED_FEATURES_SL1_EAX_AVX512_BF16 1 << 5
-// bits 6-9 are reserved
-#define CPUID_EXTENDED_FEATURES_SL1_EAX_0_REP_MOVSB 1 << 10
-#define CPUID_EXTENDED_FEATURES_SL1_EAX_FAST_STOSB 1 << 11
-#define CPUID_EXTENDED_FEATURES_SL1_EAX_FAST_CMPSB 1 << 12
-// bits 13-21 are reserved
-#define CPUID_EXTENDED_FEATURES_SL1_EAX_HRESET 1 << 22
-// bits 23-19 are reserved
-#define CPUID_EXTENDED_FEATURES_SL1_EAX_INVD_POSTPOST 1 << 30
-// bit 31 is reserved
-
-#define CPUID_EXTENDED_FEATURES_SL1_EBX_PPIN 1
-
-#define CPUID_EXTENDED_FEATURES_SL1_EDX_CET_SSS 1 << 18
-
-//=========CPUID_EXTENDED_FEATURES_SL2=========
-#define CPUID_EXTENDED_FEATURES_SL2_EDX_PSFD 1
-#define CPUID_EXTENDED_FEATURES_SL2_EDX_IPRED_CTRL 1 << 1
-#define CPUID_EXTENDED_FEATURES_SL2_EDX_RRSBA_CTRL 1 << 2
-#define CPUID_EXTENDED_FEATURES_SL2_EDX_DDPD_U 1 << 3
-#define CPUID_EXTENDED_FEATURES_SL2_EDX_BHI_CTRL 1 << 4
-// The rest of the bits are reserved
-
-enum leaves {
-  /* @ Basic CPU info
-   * @ Returned EAX: Highest basic CPUID leaf present
-   * @ Returned EBX: First 4 letters of the vendor identifier string
-   * @ Returned ECX: Third 4 letters of the vendor identifier string
-   * @ Retruned EDX: Second 4 letters of the vendor identifier string
-   */
-  CPUID_VENDOR = 0x00000000,
-  /* @ CPU Version information
-   * @ Returned EAX: Family,Model,Stepping
-   * @ Returned EBX: Brand Index,CLFLUSH line size, Max number of logical
-   * processors
-   * @ Returned ECX: Featrue information
-   * @ Retruned EDX: More feature information
-   */
-  CPUID_CPU_INFO = 0x00000001,
-  /* @ CPU Cache and TLB information
-   * @ Returned EAX: 4 Cache, prefetch or TLB descriptors
-   * @ Returned EBX: 4 Cache, prefetch or TLB descriptors
-   * @ Returned ECX: 4 Cache, prefetch or TLB descriptors
-   * @ Retruned EDX: 4 Cache, prefetch or TLB descriptors
-   */
-  CPUID_CACHE_TLB = 0x00000002,
-  /* @ CPU Serial Number !!! PENTIUM 3 ONLY !!!
-   * @ Returned EAX: Reserved
-   * @ Returned EBX: Reserved
-   * @ Returned ECX: bits 0-31 of the serial number
-   * @ Retruned EDX: bits 32-63 of the serial number
-   */
-  CPUID_SERIAL_NUMBER = 0x00000003,
-  /* @ CPU Deterministic cache parameters !!! Initial ECX = Cache level !!!
-   * @ Returned EAX: Cache level,Is self init,Is fully associative,Maximum
-   * number of addressable IDs for logical processors sharing this cache
-   * @ Returned EBX: L, P and W
-   * @ Returned ECX: S
-   * @ Retruned EDX: Cache inclusiveness and Complex Cache indexing
-   */
-  CPUID_CACHE_PARAMS = 0x00000004,
-  /* @ MONITOR/MWAIT params
-   * @ Returned EAX: Smallest monitor-line size
-   * @ Returned EBX: Largest monitor-line size
-   * @ Returned ECX: Enumeration of Monitor-Mwait extensions,Supports treating
-   * interrupts as break-event for MWAIT
-   * @ Retruned EDX: Number of sub C-states supported using MWAIT for each C
-   * number thingy IDK
-   */
-  CPUID_MONITOR_MWAIT = 0x00000005,
-  /* @ Thermal and power managment
-   * @ Returned EAX: Thermal and power info
-   * @ Returned EBX: Thermal and power info
-   * @ Returned ECX: Thermal and power info
-   * @ Retruned EDX: Thermal and power info
-   */
-  CPUID_THERMAL_AND_POWER = 0x00000006,
-  /* @ Extended features
-   * @ Returned EAX: Number of subleaves supported
-   * @ Returned EBX: Features
-   * @ Returned ECX: Features
-   * @ Retruned EDX: Features
-   */
-  CPUID_EXTENDED_FEATURES = 0x00000007,
-  /* @ Direct Cache Access Information
-   * @ Returned EAX: Value of the MSR "IA32_PLATFORM_DCA_CAP"
-   * @ Returned EBX: Reserved
-   * @ Returned ECX: Reserved
-   * @ Retruned EDX: Reserved
-   */
-  CPUID_CACHE_ACCESS_INFO = 0x00000009,
-  CPUID_PERFORMANCE_MONITORING = 0x0000000A,
-  CPUID_EXTENDENDED_TOPOLOGY = 0x0000000B,
-  CPUID_EXTENDENDED_TOPOLOGY2 = 0x0000000D,
-  CPUID_INTEL_RDT = 0x0000000F,
-  CPUID_INTEL_RDT2 = 0x00000010,
-  CPUID_INTEL_SGX = 0x00000012,
-  CPUID_CPU_TRACE_ENUM = 0x00000014,
-  CPUID_TSC = 0x00000015,
-  CPUID_CPU_FREQ_INFO = 0x00000016,
-  CPUID_SOC_VENDOR = 0x00000017,
-  CPUID_DETERMINISTIC_ADRESS_TRANSLATION_PARAMS = 0x00000018,
-  CPUID_KEY_LOCKER = 0x000000019,
-  CPUID_NATIVE_MODEL_ID = 0x0000001A,
-  CPUID_PCONFIG_INFO = 0x0000001B,
-  CPUID_LAST_BRACH = 0x00000001C,
-  CPUID_TILE_INFO = 0x00000001D,
-  CPUID_TMUL_INFO = 0x00000001E,
-  CPUID_V2_EXTENDED_TOPOLOGY = 0x00000001F,
-  CPUID_V2_EXTENDED_TOPOLOGY2 = 0x000000020,
-  // TODO: add the bitmasks for these Microsoft ones
-  /* @ Hypervisor CPUID Leaf Range
-   * @ Returned EAX: Highest hypervisor CPUID leaf present
-   * @ Returned EBX: Largest monitor-line size
-   * @ Returned ECX: Enumeration of Monitor-Mwait extensions,Supports treating
-   * interrupts as break-event for MWAIT
-   * @ Retruned EDX: Number of sub C-states supported using MWAIT for each C
-   * number thingy IDK
-   */
-  CPUID_HYPERV_IDENT = 0x40000000,
-  /* @ Hypervisor Vendor-Neutral Interface Identification
-   * @ Returned EAX: Hypervisor interface signature
-   * @ Returned EBX: Reserved
-   * @ Returned ECX: Reserved
-   * @ Retruned EDX: Reserved
-   */
-  CPUID_MS_HYPERV_INTERFCE_IDENT = 0x40000001,
-  /* @ Hypervisor System Identity
-   * @ Returned EAX: Build number
-   * @ Returned EBX: Major and minor version
-   * @ Returned ECX: Reserved
-   * @ Retruned EDX: Reserved
-   */
-  CPUID_MS_HYPERV_SYSTEM_IDENT = 0x40000002,
-  /* @ Hypervisor Feature Identification
-   * @ Returned EAX: bits 0-31 of HV_PARTITION_PRIVILEGE_MASK
-   * @ Returned EBX: bits 31-63 of HV_PARTITION_PRIVILEGE_MASK
-   * @ Returned ECX: Hyper-V features
-   * @ Retruned EDX: Hyper-V features
-   */
-  CPUID_MS_HYPERV_FEATURE_IDENT = 0x40000003,
-  /* @ Implementation Recommendations
-   * @ Returned EAX: Hyper-V feature recommendations
-   * @ Returned EBX: Hyper-V feature recommendations
-   * @ Returned ECX: Hyper-V feature recommendations
-   * @ Retruned EDX: Reserved
-   */
-  CPUID_MS_HYPERV_RECOMMENDATIONS = 0x40000004,
-  /* @ Hypervisor Implementation Limits
-   * @ Returned EAX: The maximum number of virtual processors supported
-   * @ Returned EBX: The maximum number of logical processors supported
-   * @ Returned ECX: The maximum number of physical interrupt vectors available
-   * for interrupt remapping.
-   * @ Retruned EDX: Reserved
-   */
-  CPUID_MS_HYPERV_IMPL_LIMITS = 0x40000005,
-  /* @ Implementation Hardware Features
-   * @ Returned EAX: Hardware features
-   * @ Returned EBX: Reserved
-   * @ Returned ECX: Reserved
-   * @ Retruned EDX: Reserved
-   */
-  CPUID_MS_HYPERV_HARDWARE_FEATURES = 0x40000006,
-  /* @ Nested Hypervisor Feature Identification
-   * @ Returned EAX: Nested Hypervisor features
-   * @ Returned EBX: Reserved
-   * @ Returned ECX: Reserved
-   * @ Retruned EDX: Nested Hypervisor features
-   */
-  CPUID_MS_HYPERV_NESTED_FEATURES = 0x40000009,
-  /* @ Nested Hypervisor Nested Virtualization Features
-   * @ Returned EAX: Nested Hypervisor features
-   * @ Returned EBX: Nested Hypervisor features
-   * @ Returned ECX: Reserved
-   * @ Retruned EDX: Reserved
-   */
-  CPUID_MS_HYPERV_NESTED_OPTIMISATIONS = 0x4000000A,
-  /* @ Extended processor signature
-   * @ Returned EAX: Reserved
-   * @ Returned EBX: Reserved
-   * @ Returned ECX: Extended feature bits
-   * @ Retruned EDX: Extended feature bits
-   */
-  CPUID_EXTENDED_SIGNATURE = 0x800000001,
-  /* @ Full CPU name
-   * @ Returned EAX: First 4 characters of the full CPU name
-   * @ Returned EBX: Second 4 characters of the full CPU name
-   * @ Returned ECX: Third 4 characters of the full CPU name
-   * @ Retruned EDX: Fourth 4 characters of the full CPU name
-   */
-  CPUID_BRAND_STRING1 = 0x800000002,
-  /* @ Full CPU name 2
-   * @ Returned EAX: Fifth 4 characters of the full CPU name
-   * @ Returned EBX: Sexth 4 characters of the full CPU name
-   * @ Returned ECX: Seventh 4 characters of the full CPU name
-   * @ Retruned EDX: Eightth 4 characters of the full CPU name
-   */
-  CPUID_BRAND_STRING2 = 0x800000003,
-  /* @ Full CPU name 3
-   * @ Returned EAX: Nineth 4 characters of the full CPU name
-   * @ Returned EBX: Tenth 4 characters of the full CPU name
-   * @ Returned ECX: Eleventh 4 characters of the full CPU name
-   * @ Retruned EDX: Twelveth 4 characters of the full CPU name
-   */
-  CPUID_BRAND_STRING3 = 0x800000004,
-  /* @ Cache line size and associativity
-   * @ Returned EAX: Reserved
-   * @ Returned EBX: Reserved
-   * @ Returned ECX: Bits 0-7 = Cache line size in bytes, Bits 12-15 = L2
-   * Associativity, Bits 16-31 = Cache size in 1K blocks
-   * @ Retruned EDX: Reserved
-   */
-  CPUID_MORE_CACHE = 0x800000006,
-  /* @ Invariant TSC available
-   * @ Returned EAX: Reserved
-   * @ Returned EBX: Reserved
-   * @ Returned ECX: Bit 8 = Invariant TSC available
-   * @ Retruned EDX: Reserved
-   */
-  CPUID_INVARIANT_TSC_AVAILABLE = 0x800000007,
-  /* @ Physical adress size
-   * @ Returned EAX: Bits 0-7 =  Physical Adress bits, Bits 8-15 = Linear
-   * Address bits
-   * @ Returned EBX: Bit 9 = WBNOINVD available
-   * @ Returned ECX: Reserved
-   * @ Retruned EDX: Reserved
-   */
-  CPUID_PHYS_ADDR_SIZE = 0x800000008,
-};
-
-enum sub_leaves {
-  /* @ Extended features available subleaf 1 !!! All fields return 0 is info not
-   * available !!!
-   * @ Returned EAX: Features
-   * @ Returned EBX: PPIN
-   * @ Returned ECX: Reserved
-   * @ Retruned EDX: CET_SSS
-   */
-  CPUID_EXTENDED_FEATURES_SL1 = 0x00000001,
-  /* @ Extended features available subleaf 2 !!! All fields return 0 is info not
-   * available !!!
-   * @ Returned EAX: Reserved
-   * @ Returned EBX: Reserved
-   * @ Returned ECX: Reserved
-   * @ Retruned EDX: Features
-   */
-  CPUID_EXTENDED_FEATURES_SL2 = 0x00000002,
-  CPUID_INTEL_RDT_CAPABILITY = 0x00000001,
-  CPUID_INTEL_RDT2_ALLOCATION = 0x00000000,
-  CPUID_INTEL_RDT2_RESID1 = 0x00000001,
-  CPUID_INTEL_RDT2_RESID2 = 0x00000002,
-  CPUID_INTEL_RDT2_RESID3 = 0x00000003,
-  CPUID_INTEL_SGX_SL1 = 0x00000001,
-  CPUID_INTEL_SGX_SL2 = 0x00000002,
-  CPUID_CPU_TRACE_ENUM_SL = 0x00000001,
-  CPUID_SOC_VENDOR_SL1 = 0x00000001,
-  CPUID_SOC_VENDOR_SL2 = 0x00000002,
-  CPUID_SOC_VENDOR_SL3 = 0x00000003,
-  // NOTE: goes higher than 1
-  CPUID_DETERMINISTIC_ADRESS_TRANSLATION_PARAMS_SL = 0x00000001,
-  CPUID_TILE_INFO_PALETTE1 = 0x000000001,
-};
-
-static inline void cpuid(int leaf, int subleaf, int *a, int *b, int *c,
-                         int *d) {
-  __asm__ __volatile__("cpuid"
-                       : "=a"(*a), "=b"(*b), "=c"(*c), "=d"(*d)
-                       : "a"(leaf), "c"(subleaf));
-}
-
-#endif // __CPUID_H__
\ No newline at end of file
diff --git a/kernel/src/sys/arch/x86_64/fpu.c b/kernel/src/sys/arch/x86_64/fpu.c
deleted file mode 100644
index b569c2c..0000000
--- a/kernel/src/sys/arch/x86_64/fpu.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <stddef.h>
-#include <stdint.h>
-
-void fpu_set_cw(const uint16_t cw) { asm volatile("fldcw %0" ::"m"(cw)); }
-
-void fpu_activate() {
-  size_t cr4;
-  asm volatile("mov %%cr4, %0" : "=r"(cr4));
-  cr4 |= 0x200;
-  asm volatile("mov %0, %%cr4" ::"r"(cr4));
-  fpu_set_cw(0x37F);
-}
\ No newline at end of file
diff --git a/kernel/src/sys/arch/x86_64/fpu.h b/kernel/src/sys/arch/x86_64/fpu.h
deleted file mode 100644
index e4107e6..0000000
--- a/kernel/src/sys/arch/x86_64/fpu.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-void fpu_set_cw(const uint16_t cw);
-void fpu_activate();
\ No newline at end of file
diff --git a/kernel/src/sys/arch/x86_64/gdt.c b/kernel/src/sys/arch/x86_64/gdt.c
deleted file mode 100644
index 61b6ae4..0000000
--- a/kernel/src/sys/arch/x86_64/gdt.c
+++ /dev/null
@@ -1,51 +0,0 @@
-// #include "sys/log.h"
-#include <mm/memop.h>
-#include <stdint.h>
-#include <sys/arch/x86_64/gdt.h>
-#include <sys/log.h>
-
-gdt_table def_table = {{
-                           0x0000000000000000, // 0x00
-
-                           0x00009a000000ffff, // 0x08 16 bit code
-                           0x000093000000ffff, // 0x10 16 bit data
-
-                           0x00cf9a000000ffff, // 0x18 32 bit code
-                           0x00cf93000000ffff, // 0x20 32 bit data
-
-                           0x00af9b000000ffff, // 0x28 64 bit code cs
-                           0x00af93000000ffff, // 0x30 64 bit data ss
-
-                           0x00affb000000ffff, // 0x38 user mode code cs
-                           0x00aff3000000ffff, // 0x40 user mode data ss
-                       },
-                       {}};
-
-tssr tss_list[256]; // One tssr per CPU
-
-void gdt_init(char *kstack) {
-
-  // TODO: adapt for multiprocessor kernel
-  memset(&tss_list[0], 0, sizeof(tssr));
-  tss_list[0].rsp[0] = (uint64_t)kstack;
-  tss_list[0].iopb = sizeof(tssr);
-  uintptr_t tss = (uintptr_t)&tss_list[0];
-
-  def_table.tss_entry.length = sizeof(tss_entry);
-  def_table.tss_entry.base = (uint16_t)(tss & 0xffff);
-  def_table.tss_entry.base1 = (uint8_t)((tss >> 16) & 0xff);
-  def_table.tss_entry.flags = 0x89;
-  def_table.tss_entry.flags1 = 0;
-  def_table.tss_entry.base2 = (uint8_t)((tss >> 24) & 0xff);
-  def_table.tss_entry.base3 = (uint32_t)(tss >> 32);
-  def_table.tss_entry.resv = 0;
-
-  gdtr gdt =
-      (gdtr){.size = (sizeof(gdt_table)) - 1, .address = (uint64_t)&def_table};
-
-  __asm__ volatile("lgdt %0\n\t" : : "m"(gdt) : "memory");
-  __asm__ volatile("ltr %0\n\t" : : "r"((uint16_t)0x48));
-
-  // logln(progress, "kinit stage 1", "GDT initialized\n");
-  log("gdt - initialized.\n");
-}
\ No newline at end of file
diff --git a/kernel/src/sys/arch/x86_64/idt.c b/kernel/src/sys/arch/x86_64/idt.c
deleted file mode 100644
index f82700c..0000000
--- a/kernel/src/sys/arch/x86_64/idt.c
+++ /dev/null
@@ -1,51 +0,0 @@
-// #include "sys/log.h"
-#include "sys/arch/x86_64/pic.h"
-#include <sys/arch/x86_64/idt.h>
-#include <sys/log.h>
-
-__attribute__((aligned(0x10))) static idt_entry_t idt[256];
-
-static idtr_t idtr;
-
-void idt_set_descriptor(uint8_t vector, void *isr, uint8_t flags) {
-  idt_entry_t *descriptor = &idt[vector];
-
-  descriptor->isr_low = (uint64_t)isr & 0xFFFF;
-  descriptor->kernel_cs = 0x28;
-  descriptor->ist = 0;
-  descriptor->attributes = flags;
-  descriptor->isr_mid = ((uint64_t)isr >> 16) & 0xFFFF;
-  descriptor->isr_high = ((uint64_t)isr >> 32) & 0xFFFFFFFF;
-  descriptor->reserved = 0;
-}
-
-static int vectors[256];
-
-extern void *isr_stub_table[];
-
-void idt_init() {
-  idtr.base = (uintptr_t)&idt[0];
-  idtr.limit = (uint16_t)sizeof(idt_entry_t) * 256 - 1;
-
-  for (uint16_t vector = 0; vector <= 256; vector++) {
-    if (vector == 0x80)
-      continue; // We skip the syscall handler, since it should be called from
-                // user space.
-    idt_set_descriptor(vector, isr_stub_table[vector], 0x8E);
-    vectors[vector] = 1;
-  }
-
-  uint16_t vector = 0x80;
-  idt_set_descriptor(vector, isr_stub_table[vector], 0xEE);
-  vectors[vector] = 1;
-
-  pic_init();
-  pic_unmask_irq(1);
-
-  __asm__ volatile("lidt %0" : : "m"(idtr)); // load the new IDT
-  __asm__ volatile("sti");                   // set the interrupt flag
-
-  // logln(progress, "kinit stage 1", "IDT initialized! Time to receive
-  // interrupts!\n");
-  log("idt - initialized\n");
-}
\ No newline at end of file
diff --git a/kernel/src/sys/arch/x86_64/idt.h b/kernel/src/sys/arch/x86_64/idt.h
deleted file mode 100644
index 015a379..0000000
--- a/kernel/src/sys/arch/x86_64/idt.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-typedef struct {
-  uint64_t r15;
-  uint64_t r14;
-  uint64_t r13;
-  uint64_t r12;
-  uint64_t r11;
-  uint64_t r10;
-  uint64_t r9;
-  uint64_t r8;
-  uint64_t rdi;
-  uint64_t rsi;
-  uint64_t rbp;
-  uint64_t rbx;
-  uint64_t rdx;
-  uint64_t rcx;
-  uint64_t rax;
-  uint64_t int_no;
-  uint64_t err_code;
-  uint64_t rip;
-  uint64_t cs;
-  uint64_t rflags;
-  uint64_t rsp;
-  uint64_t ss;
-} __attribute__((packed)) registers_t;
-
-typedef struct stackframe {
-  struct stackframe *rbp;
-  uint64_t rip;
-} stackframe_t;
-
-typedef struct {
-  uint16_t isr_low;   // The lower 16 bits of the ISR's address
-  uint16_t kernel_cs; // The GDT segment selector that the CPU will load into CS
-                      // before calling the ISR
-  uint8_t ist; // The IST in the TSS that the CPU will load into RSP; set to
-               // zero for now
-  uint8_t attributes; // Type and attributes; see the IDT page
-  uint16_t
-      isr_mid; // The higher 16 bits of the lower 32 bits of the ISR's address
-  uint32_t isr_high; // The higher 32 bits of the ISR's address
-  uint32_t reserved; // Set to zero
-} __attribute__((packed)) idt_entry_t;
-
-typedef struct {
-  uint16_t limit;
-  uint64_t base;
-} __attribute__((packed)) idtr_t;
-
-void idt_set_descriptor(uint8_t vector, void *isr, uint8_t flags);
-void idt_init(void);
\ No newline at end of file
diff --git a/kernel/src/sys/arch/x86_64/interrupts.asm b/kernel/src/sys/arch/x86_64/interrupts.asm
deleted file mode 100755
index 860dc37..0000000
--- a/kernel/src/sys/arch/x86_64/interrupts.asm
+++ /dev/null
@@ -1,335 +0,0 @@
-%macro pushall 0
-  push rax
-  push rcx
-  push rdx
-  push rbx
-  push rbp
-  push rsi
-  push rdi
-  push r8
-  push r9
-  push r10
-  push r11
-  push r12
-  push r13
-  push r14
-  push r15
-%endmacro
-
-%macro popall 0
-  pop r15
-  pop r14
-  pop r13
-  pop r12
-  pop r11
-  pop r10
-  pop r9
-  pop r8
-  pop rdi
-  pop rsi
-  pop rbp
-  pop rbx
-  pop rdx
-  pop rcx
-  pop rax
-%endmacro
-
-%macro isr_err_stub 1
-isr_stub_%+%1:
-
-    push %1
-    pushall
-
-    mov rdi, rsp
-
-    call exception_handler
-
-    popall
-
-    add rsp, 16
-    iretq
-%endmacro
-
-%macro isr_no_err_stub 1
-isr_stub_%+%1:
-    push 0
-    push %1
-    pushall
-
-    mov rdi, rsp
-
-    call exception_handler
-
-    popall
-
-    add rsp, 16
-    iretq
-%endmacro
-
-extern exception_handler
-isr_no_err_stub 0
-isr_no_err_stub 1
-isr_no_err_stub 2
-isr_no_err_stub 3
-isr_no_err_stub 4
-isr_no_err_stub 5
-isr_no_err_stub 6
-isr_no_err_stub 7
-isr_err_stub    8
-isr_no_err_stub 9
-isr_err_stub    10
-isr_err_stub    11
-isr_err_stub    12
-isr_err_stub    13
-isr_err_stub    14
-isr_no_err_stub 15
-isr_no_err_stub 16
-isr_err_stub    17
-isr_no_err_stub 18
-isr_no_err_stub 19
-isr_no_err_stub 20
-isr_no_err_stub 21
-isr_no_err_stub 22
-isr_no_err_stub 23
-isr_no_err_stub 24
-isr_no_err_stub 25
-isr_no_err_stub 26
-isr_no_err_stub 27
-isr_no_err_stub 28
-isr_no_err_stub 29
-isr_err_stub    30
-isr_no_err_stub 31
-
-
-isr_no_err_stub 32
-isr_no_err_stub 33
-isr_no_err_stub 34
-isr_no_err_stub 35
-isr_no_err_stub 36
-isr_no_err_stub 37
-isr_no_err_stub 38
-isr_no_err_stub 39
-isr_no_err_stub 40
-isr_no_err_stub 41
-isr_no_err_stub 42
-isr_no_err_stub 43
-isr_no_err_stub 44
-isr_no_err_stub 45
-isr_no_err_stub 46
-isr_no_err_stub 47
-isr_no_err_stub 48
-isr_no_err_stub 49
-isr_no_err_stub 50
-isr_no_err_stub 51
-isr_no_err_stub 52
-isr_no_err_stub 53
-isr_no_err_stub 54
-isr_no_err_stub 55
-isr_no_err_stub 56
-isr_no_err_stub 57
-isr_no_err_stub 58
-isr_no_err_stub 59
-isr_no_err_stub 60
-isr_no_err_stub 61
-isr_no_err_stub 62
-isr_no_err_stub 63
-isr_no_err_stub 64
-isr_no_err_stub 65
-isr_no_err_stub 66
-isr_no_err_stub 67
-isr_no_err_stub 68
-isr_no_err_stub 69
-isr_no_err_stub 70
-isr_no_err_stub 71
-isr_no_err_stub 72
-isr_no_err_stub 73
-isr_no_err_stub 74
-isr_no_err_stub 75
-isr_no_err_stub 76
-isr_no_err_stub 77
-isr_no_err_stub 78
-isr_no_err_stub 79
-isr_no_err_stub 80
-isr_no_err_stub 81
-isr_no_err_stub 82
-isr_no_err_stub 83
-isr_no_err_stub 84
-isr_no_err_stub 85
-isr_no_err_stub 86
-isr_no_err_stub 87
-isr_no_err_stub 88
-isr_no_err_stub 89
-isr_no_err_stub 90
-isr_no_err_stub 91
-isr_no_err_stub 92
-isr_no_err_stub 93
-isr_no_err_stub 94
-isr_no_err_stub 95
-isr_no_err_stub 96
-isr_no_err_stub 97
-isr_no_err_stub 98
-isr_no_err_stub 99
-isr_no_err_stub 100
-isr_no_err_stub 101
-isr_no_err_stub 102
-isr_no_err_stub 103
-isr_no_err_stub 104
-isr_no_err_stub 105
-isr_no_err_stub 106
-isr_no_err_stub 107
-isr_no_err_stub 108
-isr_no_err_stub 109
-isr_no_err_stub 110
-isr_no_err_stub 111
-isr_no_err_stub 112
-isr_no_err_stub 113
-isr_no_err_stub 114
-isr_no_err_stub 115
-isr_no_err_stub 116
-isr_no_err_stub 117
-isr_no_err_stub 118
-isr_no_err_stub 119
-isr_no_err_stub 120
-isr_no_err_stub 121
-isr_no_err_stub 122
-isr_no_err_stub 123
-isr_no_err_stub 124
-isr_no_err_stub 125
-isr_no_err_stub 126
-isr_no_err_stub 127
-isr_no_err_stub 128
-isr_no_err_stub 129
-isr_no_err_stub 130
-isr_no_err_stub 131
-isr_no_err_stub 132
-isr_no_err_stub 133
-isr_no_err_stub 134
-isr_no_err_stub 135
-isr_no_err_stub 136
-isr_no_err_stub 137
-isr_no_err_stub 138
-isr_no_err_stub 139
-isr_no_err_stub 140
-isr_no_err_stub 141
-isr_no_err_stub 142
-isr_no_err_stub 143
-isr_no_err_stub 144
-isr_no_err_stub 145
-isr_no_err_stub 146
-isr_no_err_stub 147
-isr_no_err_stub 148
-isr_no_err_stub 149
-isr_no_err_stub 150
-isr_no_err_stub 151
-isr_no_err_stub 152
-isr_no_err_stub 153
-isr_no_err_stub 154
-isr_no_err_stub 155
-isr_no_err_stub 156
-isr_no_err_stub 157
-isr_no_err_stub 158
-isr_no_err_stub 159
-isr_no_err_stub 160
-isr_no_err_stub 161
-isr_no_err_stub 162
-isr_no_err_stub 163
-isr_no_err_stub 164
-isr_no_err_stub 165
-isr_no_err_stub 166
-isr_no_err_stub 167
-isr_no_err_stub 168
-isr_no_err_stub 169
-isr_no_err_stub 170
-isr_no_err_stub 171
-isr_no_err_stub 172
-isr_no_err_stub 173
-isr_no_err_stub 174
-isr_no_err_stub 175
-isr_no_err_stub 176
-isr_no_err_stub 177
-isr_no_err_stub 178
-isr_no_err_stub 179
-isr_no_err_stub 180
-isr_no_err_stub 181
-isr_no_err_stub 182
-isr_no_err_stub 183
-isr_no_err_stub 184
-isr_no_err_stub 185
-isr_no_err_stub 186
-isr_no_err_stub 187
-isr_no_err_stub 188
-isr_no_err_stub 189
-isr_no_err_stub 190
-isr_no_err_stub 191
-isr_no_err_stub 192
-isr_no_err_stub 193
-isr_no_err_stub 194
-isr_no_err_stub 195
-isr_no_err_stub 196
-isr_no_err_stub 197
-isr_no_err_stub 198
-isr_no_err_stub 199
-isr_no_err_stub 200
-isr_no_err_stub 201
-isr_no_err_stub 202
-isr_no_err_stub 203
-isr_no_err_stub 204
-isr_no_err_stub 205
-isr_no_err_stub 206
-isr_no_err_stub 207
-isr_no_err_stub 208
-isr_no_err_stub 209
-isr_no_err_stub 210
-isr_no_err_stub 211
-isr_no_err_stub 212
-isr_no_err_stub 213
-isr_no_err_stub 214
-isr_no_err_stub 215
-isr_no_err_stub 216
-isr_no_err_stub 217
-isr_no_err_stub 218
-isr_no_err_stub 219
-isr_no_err_stub 220
-isr_no_err_stub 221
-isr_no_err_stub 222
-isr_no_err_stub 223
-isr_no_err_stub 224
-isr_no_err_stub 225
-isr_no_err_stub 226
-isr_no_err_stub 227
-isr_no_err_stub 228
-isr_no_err_stub 229
-isr_no_err_stub 230
-isr_no_err_stub 231
-isr_no_err_stub 232
-isr_no_err_stub 233
-isr_no_err_stub 234
-isr_no_err_stub 235
-isr_no_err_stub 236
-isr_no_err_stub 237
-isr_no_err_stub 238
-isr_no_err_stub 239
-isr_no_err_stub 240
-isr_no_err_stub 241
-isr_no_err_stub 242
-isr_no_err_stub 243
-isr_no_err_stub 244
-isr_no_err_stub 245
-isr_no_err_stub 246
-isr_no_err_stub 247
-isr_no_err_stub 248
-isr_no_err_stub 249
-isr_no_err_stub 250
-isr_no_err_stub 251
-isr_no_err_stub 252
-isr_no_err_stub 253
-isr_no_err_stub 254
-isr_no_err_stub 255
-
-global isr_stub_table
-isr_stub_table:
-%assign i 0 
-%rep    256
-    dq isr_stub_%+i ; use DQ instead if targeting 64-bit
-%assign i i+1 
-%endrep
\ No newline at end of file
diff --git a/kernel/src/sys/arch/x86_64/interrupts.c b/kernel/src/sys/arch/x86_64/interrupts.c
deleted file mode 100644
index 8e3643c..0000000
--- a/kernel/src/sys/arch/x86_64/interrupts.c
+++ /dev/null
@@ -1,79 +0,0 @@
-// #include "mm/pmm.h"
-// #include "mm/vmm.h"
-#include "mm/pmm.h"
-#include "mm/vmm.h"
-#include "sched/sched.h"
-#include "sys/arch/x86_64/pic.h"
-#include "sys/arch/x86_64/rtc.h"
-#include "sys/log.h"
-#include "sys/syscall.h"
-// #include "sys/sched.h"
-#include <stdint.h>
-#include <sys/arch/x86_64/idt.h>
-#include <sys/arch/x86_64/io.h>
-// #include <sys/errhand/panic.h>
-
-int pit_millis = 0;
-int pit_secs = 0;
-extern int vmm_kernel_pm_exists;
-
-struct Idt_StackFrame {
-  struct Idt_StackFrame *rbp;
-  uint64_t rip;
-} __attribute__((packed));
-
-void dump_backtrace(registers_t *r) {
-  log("ints - backtrace : \n");
-  struct Idt_StackFrame *frame = (struct Idt_StackFrame *)r->rbp;
-
-  while (frame) {
-    log("ints -   %s (ip: %p)\n", frame->rip);
-    frame = frame->rbp;
-  }
-  log("ints -   <end of backtrace>\n");
-}
-
-void pit_handler(registers_t *regs);
-
-void exception_handler(registers_t *regs) {
-  vmm_load_pagemap(vmm_kernel_pm);
-
-  if (regs->int_no < 32) {
-    // panic(kmode_cpu_exception, regs);
-    log("ints - %d (RIP: %p, ERR: %d)\n", regs->int_no, regs->rip,
-        regs->err_code);
-
-    if (regs->int_no == 0xe && vmm_kernel_pm_exists) {
-      uint64_t cr2;
-      asm("mov %%cr2, %0" : "=r"(cr2));
-      log("ints - PF: Faulting location: %p (%p)\n", cr2,
-          virt_to_phys(vmm_current_pm, cr2));
-      log("ints - PF: Faulting page flags: %p\n",
-          vmm_get_flags(vmm_current_pm, cr2));
-      log("ints - PF: Faulting page map: %p\n", PHYSICAL(vmm_current_pm));
-    }
-
-    // dump_backtrace(regs);
-    asm("cli");
-    while (1)
-      asm("hlt");
-  }
-
-  if (regs->int_no == 1 + 32) {
-    if (inb(0x60) & 0x80) {
-      pic_ack(regs->int_no - 32);
-      return;
-    }
-
-    log("ints - keyboard\n");
-  } else if (regs->int_no == 32 + 8) {
-    rtc_handle_interrupt(regs);
-  } else if (regs->int_no == 0x80 - 32 || regs->int_no == 32) {
-    pit_handler(regs);
-  } else if (regs->int_no == 0x80) {
-    syscall_handle(regs);
-  }
-  // logln(info, "arch/ints", "Received interrupt %d\n", regs->int_no);
-  //vmm_load_pagemap(curr_proc->pm);
-  pic_ack(regs->int_no - 32);
-}
\ No newline at end of file
diff --git a/kernel/src/sys/arch/x86_64/io.c b/kernel/src/sys/arch/x86_64/io.c
deleted file mode 100755
index 80b1919..0000000
--- a/kernel/src/sys/arch/x86_64/io.c
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (C) 2024 Sipaa Projects
-// This code is part of the Soaplin kernel and is licensed under the terms of
-// the MIT License.
-
-#include <stdint.h>
-
-uint8_t inb(uint16_t port) {
-  uint8_t ret;
-  __asm__ volatile("inb %w1, %b0" : "=a"(ret) : "Nd"(port) : "memory");
-  return ret;
-}
-
-void outb(uint16_t port, uint8_t val) {
-  __asm__ volatile("outb %b0, %w1" : : "a"(val), "Nd"(port) : "memory");
-}
-
-void io_wait(void) { outb(0x80, 0); }
\ No newline at end of file
diff --git a/kernel/src/sys/arch/x86_64/io.h b/kernel/src/sys/arch/x86_64/io.h
deleted file mode 100755
index 3e41421..0000000
--- a/kernel/src/sys/arch/x86_64/io.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (C) 2024 Sipaa Projects
-// This code is part of the Soaplin kernel and is licensed under the terms of
-// the MIT License.
-
-#pragma once
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-uint8_t inb(uint16_t port);
-void outb(uint16_t port, uint8_t val);
-void io_wait(void);
-
-#ifdef __cplusplus
-}
-#endif
\ No newline at end of file
diff --git a/kernel/src/sys/arch/x86_64/pic.c b/kernel/src/sys/arch/x86_64/pic.c
deleted file mode 100644
index 53ce230..0000000
--- a/kernel/src/sys/arch/x86_64/pic.c
+++ /dev/null
@@ -1,76 +0,0 @@
-// #include "sys/log.h"
-#include <sys/arch/x86_64/pic.h>
-// #include <sys/acpi.h>
-#include <sys/arch/x86_64/io.h>
-
-void pic_init() {
-  // if (acpi_available)
-  //     return;
-
-  uint8_t a1, a2;
-
-  a1 = inb(PIC1_DATA);
-  a2 = inb(PIC2_DATA);
-
-  outb(PIC1_COMMAND, ICW1_INIT | ICW1_ICW4);
-  io_wait();
-  outb(PIC2_COMMAND, ICW1_INIT | ICW1_ICW4);
-  io_wait();
-  outb(PIC1_DATA, 0x20);
-  io_wait();
-  outb(PIC2_DATA, 8);
-  io_wait();
-  outb(PIC1_DATA, 4);
-  io_wait();
-  outb(PIC2_DATA, 2);
-  io_wait();
-  outb(PIC1_DATA, ICW4_8086);
-  io_wait();
-  outb(PIC2_DATA, ICW4_8086);
-  io_wait();
-
-  outb(PIC1_DATA, a1);
-  outb(PIC2_DATA, a2);
-}
-
-void pic_ack(int intno) {
-  if (intno >= 8) {
-    outb(PIC2_COMMAND, 0x20);
-  }
-
-  outb(PIC1_COMMAND, 0x20);
-}
-
-void pic_disable() // if we want APIC
-{
-  outb(PIC2_DATA, 0xff);
-  outb(PIC1_DATA, 0xff);
-}
-
-void pic_mask_irq(uint8_t irq) {
-  uint16_t port;
-  uint8_t value;
-
-  if (irq < 8) {
-    port = PIC1_DATA;
-  } else {
-    port = PIC2_DATA;
-    irq -= 8;
-  }
-  value = inb(port) | (1 << irq);
-  outb(port, value);
-}
-
-void pic_unmask_irq(uint8_t irq) {
-  uint16_t port;
-  uint8_t value;
-
-  if (irq < 8) {
-    port = PIC1_DATA;
-  } else {
-    port = PIC2_DATA;
-    irq -= 8;
-  }
-  value = inb(port) & ~(1 << irq);
-  outb(port, value);
-}
\ No newline at end of file
diff --git a/kernel/src/sys/arch/x86_64/pic.h b/kernel/src/sys/arch/x86_64/pic.h
deleted file mode 100755
index 8365bbc..0000000
--- a/kernel/src/sys/arch/x86_64/pic.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (C) 2024 Sipaa Projects
-// This code is part of the Soaplin kernel and is licensed under the terms of
-// the MIT License.
-
-#pragma once
-
-#include <stdint.h>
-
-#define PIC1_COMMAND 0x20
-#define PIC1_DATA 0x21
-#define PIC2_COMMAND 0xA0
-#define PIC2_DATA 0xA1
-#define PIC_EOI 0x20
-
-#define ICW1_INIT 0x10
-#define ICW1_ICW4 0x01
-#define ICW4_8086 0x01
-
-void pic_init();
-void pic_ack(int intno);
-void pic_disable(); // if we want APIC
-void pic_mask_irq(uint8_t irq);
-void pic_unmask_irq(uint8_t irq);
\ No newline at end of file
diff --git a/kernel/src/sys/arch/x86_64/pit.c b/kernel/src/sys/arch/x86_64/pit.c
deleted file mode 100644
index 32b60c3..0000000
--- a/kernel/src/sys/arch/x86_64/pit.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include "sched/sched.h"
-#include "sys/arch/x86_64/idt.h"
-#include "sys/arch/x86_64/pic.h"
-#include <stdint.h>
-#include <sys/log.h>
-#ifdef __x86_64__
-
-#include <sys/arch/x86_64/idt.h>
-#include <sys/arch/x86_64/pit.h>
-// #include <sipaa/sched.h>
-
-uint32_t tick = 0;
-
-void pit_handler(registers_t *regs) {
-  tick++;
-
-  schedule(regs);
-  // Scheduler_Schedule(regs);
-}
-
-void pit_init(uint32_t frequency) {
-  uint32_t divisor = PIT_FREQUENCY / frequency;
-  outb(0x43, 0x34);
-  outb(0x40, (uint8_t)(divisor & 0xFF));
-  outb(0x40, (uint8_t)((divisor >> 8) & 0xFF));
-
-  pic_unmask_irq(0);
-}
-
-void sleep(uint32_t seconds) {
-  uint32_t eticks = tick + seconds * HZ;
-  while (tick < eticks) {
-    __asm__ __volatile__("hlt");
-  }
-}
-
-void sleep_ms(uint32_t milliseconds) {
-  uint32_t eticks = tick + (milliseconds * HZ) / 1000;
-  while (tick < eticks) {
-    __asm__ __volatile__("hlt");
-  }
-}
-
-// todo: unistd: add usleep function
-void usleep(uint32_t usecs) {
-  uint32_t eticks = tick + (usecs * HZ);
-  while (tick < eticks) {
-    __asm__ __volatile__("hlt");
-  }
-}
-
-#endif
\ No newline at end of file
diff --git a/kernel/src/sys/arch/x86_64/pit.h b/kernel/src/sys/arch/x86_64/pit.h
deleted file mode 100755
index 0131be8..0000000
--- a/kernel/src/sys/arch/x86_64/pit.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef PIT_H
-#define PIT_H
-
-#include <stdint.h>
-#include <sys/arch/x86_64/io.h>
-
-#define PIT_FREQUENCY 1193182
-#define HZ 1000
-
-extern uint32_t tick;
-
-void pit_init(uint32_t frequency);
-void sleep(uint32_t seconds);
-void sleep_ms(uint32_t milliseconds);
-void usleep(uint32_t usecs);
-
-#endif
\ No newline at end of file
diff --git a/kernel/src/sys/arch/x86_64/rtc.c b/kernel/src/sys/arch/x86_64/rtc.c
deleted file mode 100644
index 9b277ef..0000000
--- a/kernel/src/sys/arch/x86_64/rtc.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "sys/arch/x86_64/idt.h"
-#include "sys/arch/x86_64/io.h"
-#include <sys/arch/x86_64/pic.h>
-#include <sys/arch/x86_64/rtc.h>
-#include <sys/printf.h>
-
-void rtc_init() {
-  asm("cli");
-  outb(0x70, 0x8A);
-  outb(0x71, 0x20);
-  asm("sti");
-
-  asm("cli");            // disable interrupts
-  outb(0x70, 0x8B);      // select register B, and disable NMI
-  char prev = inb(0x71); // read the current value of register B
-  outb(0x70,
-       0x8B); // set the index again (a read will reset the index to register D)
-  outb(0x71, prev | 0x40); // write the previous value ORed with 0x40. This
-                           // turns on bit 6 of register B
-  asm("sti");
-
-  // pic_unmask_irq(8);
-}
-
-void rtc_handle_interrupt(registers_t *regs) {
-  (void)regs;
-  printf("RTC!\n");
-}
\ No newline at end of file
diff --git a/kernel/src/sys/arch/x86_64/rtc.h b/kernel/src/sys/arch/x86_64/rtc.h
deleted file mode 100755
index a81996d..0000000
--- a/kernel/src/sys/arch/x86_64/rtc.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include "sys/arch/x86_64/idt.h"
-
-void rtc_init();
-void rtc_handle_interrupt(registers_t *regs);
\ No newline at end of file
diff --git a/kernel/src/sys/arch/x86_64/smp.c b/kernel/src/sys/arch/x86_64/smp.c
deleted file mode 100644
index 33183b6..0000000
--- a/kernel/src/sys/arch/x86_64/smp.c
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "sys/arch/x86_64/smp.h"
-#include "limine.h"
-
-void smp_init() {}
\ No newline at end of file
diff --git a/kernel/src/sys/arch/x86_64/smp.h b/kernel/src/sys/arch/x86_64/smp.h
deleted file mode 100644
index a5c81cb..0000000
--- a/kernel/src/sys/arch/x86_64/smp.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-void smp_init();
\ No newline at end of file
diff --git a/kernel/src/sys/arch/x86_64/sse.c b/kernel/src/sys/arch/x86_64/sse.c
deleted file mode 100644
index 2f3f021..0000000
--- a/kernel/src/sys/arch/x86_64/sse.c
+++ /dev/null
@@ -1,59 +0,0 @@
-#include <sys/arch/x86_64/sse.h>
-#include <sys/log.h>
-#include <sys/printf.h>
-
-int cpuid_check_bit(int reg, int bit) {
-  int eax, ebx, ecx, edx;
-
-  // Minimal inline assembly to execute CPUID
-  __asm__ volatile("cpuid" // Execute CPUID instruction
-                   : "=a"(eax), "=b"(ebx), "=c"(ecx),
-                     "=d"(edx) // Output registers
-                   : "a"(0x1)  // Input: EAX = 0x1 (query feature flags)
-                   :           // No clobbered registers
-  );
-
-  // Check bit 25 of EDX (SSE support) in plain C
-  if (reg == 0) {
-    if (edx & (1 << bit)) {
-      return 1; // SSE is supported
-    } else {
-      return 0; // SSE is not supported
-    }
-  } else if (reg == 1) {
-    if (ecx & (1 << bit)) {
-      return 1; // SSE is supported
-    } else {
-      return 0; // SSE is not supported
-    }
-  }
-
-  return 0;
-}
-
-void sse_init() {
-  int sse = cpuid_check_bit(0, 25);
-  int sse2 = cpuid_check_bit(0, 26);
-  int sse3 = cpuid_check_bit(1, 0);
-  int ssse3 = cpuid_check_bit(1, 9);
-
-  if (sse)
-    log("sse - sse is supported!\n");
-  else
-    log("sse - sse isn't supported!\n");
-
-  if (sse2)
-    log("sse - sse2 is supported!\n");
-  else
-    log("sse - sse2 isn't supported!\n");
-
-  if (sse3)
-    log("sse - sse3 is supported!\n");
-  else
-    log("sse - sse3 isn't supported!\n");
-
-  if (ssse3)
-    log("sse - ssse3 is supported!\n");
-  else
-    log("sse - ssse3 isn't supported!\n");
-}
\ No newline at end of file
diff --git a/kernel/src/sys/arch/x86_64/sse.h b/kernel/src/sys/arch/x86_64/sse.h
deleted file mode 100755
index b4500fa..0000000
--- a/kernel/src/sys/arch/x86_64/sse.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-int sse_is_supported();
-void sse_init();
\ No newline at end of file
diff --git a/kernel/src/sys/error_handling/panic.c b/kernel/src/sys/error_handling/panic.c
deleted file mode 100644
index c867ff3..0000000
--- a/kernel/src/sys/error_handling/panic.c
+++ /dev/null
@@ -1 +0,0 @@
-void panic_ctx() {}
\ No newline at end of file
diff --git a/kernel/src/sys/gfx/flanterm/.gitignore b/kernel/src/sys/gfx/flanterm/.gitignore
deleted file mode 100644
index cc62e43..0000000
--- a/kernel/src/sys/gfx/flanterm/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.d
-*.o
\ No newline at end of file
diff --git a/kernel/src/sys/gfx/flanterm/LICENSE b/kernel/src/sys/gfx/flanterm/LICENSE
deleted file mode 100644
index b3f6075..0000000
--- a/kernel/src/sys/gfx/flanterm/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (C) 2022-2025 mintsuki and contributors.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/kernel/src/sys/gfx/flanterm/README.md b/kernel/src/sys/gfx/flanterm/README.md
deleted file mode 100644
index 37cae29..0000000
--- a/kernel/src/sys/gfx/flanterm/README.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Flanterm
-
-Flanterm is a fast and reasonably complete terminal emulator with support for
-multiple output backends. Included is a fast framebuffer backend.
-
-### Quick usage
-
-To quickly set up and use a framebuffer Flanterm instance, it is possible to
-use the `flanterm_fb_init()` function as such:
-```c
-#include <flanterm/flanterm.h>
-#include <flanterm/backends/fb.h>
-
-struct flanterm_context *ft_ctx = flanterm_fb_init(
-        NULL,
-        NULL,
-        framebuffer_ptr, width, height, pitch,
-        red_mask_size, red_mask_shift,
-        green_mask_size, green_mask_shift,
-        blue_mask_size, blue_mask_shift,
-        NULL,
-        NULL, NULL,
-        NULL, NULL,
-        NULL, NULL,
-        NULL, 0, 0, 1,
-        0, 0,
-        0
-    );
-```
-Where `framebuffer_ptr, width, height, pitch` and `{red,green,blue}_mask_{size,shift}`
-represent the corresponding info about the framebuffer to use for this given instance.
-
-The meaning of the other arguments can be found in `backends/fb.h`.
-
-To then print to the terminal instance, simply use the `flanterm_write()`
-function on the given instance. For example:
-```c
-#include <flanterm/flanterm.h>
-
-const char msg[] = "Hello world\n";
-
-flanterm_write(ft_ctx, msg, sizeof(msg));
-```
diff --git a/kernel/src/sys/gfx/flanterm/backends/fb.c b/kernel/src/sys/gfx/flanterm/backends/fb.c
deleted file mode 100644
index e3bac67..0000000
--- a/kernel/src/sys/gfx/flanterm/backends/fb.c
+++ /dev/null
@@ -1,1296 +0,0 @@
-/* Copyright (C) 2022-2025 mintsuki and contributors.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifdef __cplusplus
-#error                                                                         \
-    "Please do not compile Flanterm as C++ code! Flanterm should be compiled as C99 or newer."
-#endif
-
-#ifndef __STDC_VERSION__
-#error "Flanterm must be compiled as C99 or newer."
-#endif
-
-#if defined(_MSC_VER)
-#define ALWAYS_INLINE __forceinline
-#elif defined(__GNUC__) || defined(__clang__)
-#define ALWAYS_INLINE __attribute__((always_inline)) inline
-#else
-#define ALWAYS_INLINE inline
-#endif
-
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-
-#define FLANTERM_IN_FLANTERM
-
-#include "../flanterm.h"
-#include "fb.h"
-
-void *memset(void *, int, size_t);
-void *memcpy(void *, const void *, size_t);
-
-#ifndef FLANTERM_FB_DISABLE_BUMP_ALLOC
-
-#ifndef FLANTERM_FB_BUMP_ALLOC_POOL_SIZE
-#define FLANTERM_FB_BUMP_ALLOC_POOL_SIZE 873000
-
-#define FLANTERM_FB_WIDTH_LIMIT 1920
-#define FLANTERM_FB_HEIGHT_LIMIT 1200
-#endif
-
-static uint8_t bump_alloc_pool[FLANTERM_FB_BUMP_ALLOC_POOL_SIZE];
-static size_t bump_alloc_ptr = 0;
-
-static void *bump_alloc(size_t s) {
-  static bool base_offset_added = false;
-  if (!base_offset_added) {
-    if ((uintptr_t)bump_alloc_pool & 0xf) {
-      bump_alloc_ptr += 0x10 - ((uintptr_t)bump_alloc_pool & 0xf);
-    }
-    base_offset_added = true;
-  }
-
-  if ((s & 0xf) != 0) {
-    s += 0x10;
-    s &= ~(size_t)0xf;
-  }
-
-  size_t next_ptr = bump_alloc_ptr + s;
-  if (next_ptr > FLANTERM_FB_BUMP_ALLOC_POOL_SIZE) {
-    return NULL;
-  }
-  void *ret = &bump_alloc_pool[bump_alloc_ptr];
-  bump_alloc_ptr = next_ptr;
-  return ret;
-}
-
-static bool bump_allocated_instance = false;
-
-#endif
-
-// Builtin font originally taken from:
-// https://github.com/viler-int10h/vga-text-mode-fonts/raw/master/FONTS/PC-OTHER/TOSH-SAT.F16
-static const uint8_t builtin_font[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x81, 0x81, 0xa5, 0xa5, 0x81,
-    0x81, 0xa5, 0x99, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x3c, 0x7e, 0xff,
-    0xff, 0xdb, 0xdb, 0xff, 0xff, 0xdb, 0xe7, 0xff, 0x7e, 0x3c, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x6c, 0xfe, 0xfe, 0xfe, 0x7c, 0x7c, 0x38, 0x38, 0x10,
-    0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x38, 0x38, 0x7c, 0x7c, 0xfe,
-    0x7c, 0x7c, 0x38, 0x38, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,
-    0x3c, 0x3c, 0xdb, 0xff, 0xff, 0xdb, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x18, 0x3c, 0x7e, 0xff, 0xff, 0xff, 0x66, 0x18, 0x18,
-    0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x78,
-    0x78, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xe7, 0xc3, 0xc3, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xcc, 0x84, 0x84, 0xcc, 0x78, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc3, 0x99, 0xbd,
-    0xbd, 0x99, 0xc3, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x1e,
-    0x0e, 0x1e, 0x32, 0x78, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x78, 0xcc, 0xcc, 0xcc, 0x78, 0x30, 0xfc, 0x30, 0x30,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x18, 0x1c, 0x1e, 0x16, 0x12,
-    0x10, 0x10, 0x70, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x38, 0x2c,
-    0x26, 0x32, 0x3a, 0x2e, 0x26, 0x22, 0x62, 0xe2, 0xc6, 0x0e, 0x0c, 0x00,
-    0x00, 0x00, 0x00, 0x18, 0x18, 0xdb, 0x3c, 0xe7, 0x3c, 0xdb, 0x18, 0x18,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf8, 0xfe,
-    0xf8, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
-    0x06, 0x0e, 0x3e, 0xfe, 0x3e, 0x0e, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x30, 0x78, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x30, 0xfc, 0x78,
-    0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
-    0xcc, 0xcc, 0x00, 0xcc, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xdb,
-    0xdb, 0xdb, 0xdb, 0x7b, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x7c, 0xc6, 0x60, 0x38, 0x6c, 0xc6, 0xc6, 0x6c, 0x38, 0x0c,
-    0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xfe, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x78,
-    0xfc, 0x30, 0x30, 0x30, 0x30, 0x30, 0xfc, 0x78, 0x30, 0xfc, 0x00, 0x00,
-    0x00, 0x00, 0x30, 0x78, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
-    0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
-    0x30, 0x30, 0xfc, 0x78, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x18, 0x0c, 0xfe, 0xfe, 0x0c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x60, 0xfe, 0xfe, 0x60, 0x30, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
-    0xc0, 0xc0, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x24, 0x66, 0xff, 0xff, 0x66, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x38, 0x38, 0x7c, 0x7c, 0xfe, 0xfe,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0x7c, 0x7c,
-    0x38, 0x38, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x30, 0x78, 0x78, 0x78, 0x78, 0x30, 0x30, 0x30, 0x00, 0x30,
-    0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c,
-    0x6c, 0xfe, 0x6c, 0x6c, 0x6c, 0xfe, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00,
-    0x00, 0x18, 0x18, 0x7c, 0xc6, 0xc0, 0xc0, 0x7c, 0x06, 0x06, 0xc6, 0x7c,
-    0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0x0c, 0x0c, 0x18, 0x38,
-    0x30, 0x60, 0x60, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c,
-    0x6c, 0x38, 0x30, 0x76, 0xde, 0xcc, 0xcc, 0xde, 0x76, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x18, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x60, 0x60, 0x60, 0x60,
-    0x60, 0x60, 0x60, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x30,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x30, 0x60, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x38, 0xfe, 0x38, 0x6c, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e,
-    0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x06,
-    0x0c, 0x0c, 0x18, 0x38, 0x30, 0x60, 0x60, 0xc0, 0xc0, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xc6, 0xc6, 0xc6,
-    0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x38, 0x78, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6,
-    0x06, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0xc0, 0xfe, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x7c, 0xc6, 0x06, 0x06, 0x3c, 0x06, 0x06, 0x06, 0x06, 0xc6,
-    0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x0c, 0x1c, 0x3c, 0x6c, 0xcc,
-    0xfe, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc0,
-    0xc0, 0xc0, 0xfc, 0x06, 0x06, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x3c, 0x60, 0xc0, 0xc0, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
-    0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc6, 0x06, 0x06, 0x0c, 0x18,
-    0x30, 0x30, 0x30, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6,
-    0xc6, 0xc6, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x0c,
-    0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,
-    0x18, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x30, 0x00, 0x00,
-    0x00, 0x00, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x60, 0x30, 0x18, 0x0c,
-    0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00,
-    0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x60,
-    0x30, 0x18, 0x0c, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x06, 0x0c, 0x18, 0x30, 0x30, 0x00, 0x30,
-    0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xde, 0xde,
-    0xde, 0xde, 0xc0, 0xc0, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c,
-    0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xfc, 0xc6, 0xc6, 0xc6, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
-    0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc0,
-    0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xcc,
-    0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xcc, 0xf8, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xfc, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-    0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xfc, 0xc0,
-    0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6,
-    0xc0, 0xc0, 0xc0, 0xde, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6,
-    0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x30,
-    0x30, 0x30, 0x30, 0x30, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x0c,
-    0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xc6, 0xc6, 0xcc, 0xd8, 0xf0, 0xe0, 0xf0, 0xd8, 0xcc, 0xc6,
-    0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-    0xc0, 0xc0, 0xc0, 0xc0, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6,
-    0xee, 0xfe, 0xd6, 0xd6, 0xd6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xc6, 0xc6, 0xe6, 0xe6, 0xf6, 0xde, 0xce, 0xce, 0xc6, 0xc6,
-    0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
-    0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xc6,
-    0xc6, 0xc6, 0xc6, 0xfc, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xf6, 0xda,
-    0x6c, 0x06, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xfc,
-    0xd8, 0xcc, 0xcc, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6,
-    0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
-    0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6,
-    0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x6c, 0x38, 0x10, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c,
-    0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0x6c, 0x38, 0x38,
-    0x38, 0x6c, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc,
-    0xcc, 0xcc, 0xcc, 0x78, 0x30, 0x30, 0x30, 0x30, 0x30, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xfe, 0x06, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0xc0, 0xc0,
-    0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x60, 0x60, 0x60, 0x60, 0x60,
-    0x60, 0x60, 0x60, 0x60, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0,
-    0x60, 0x60, 0x30, 0x38, 0x18, 0x0c, 0x0c, 0x06, 0x06, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x78, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00,
-    0x00, 0x00, 0x18, 0x18, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x06, 0x06,
-    0x7e, 0xc6, 0xc6, 0xc6, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0,
-    0xc0, 0xdc, 0xe6, 0xc6, 0xc6, 0xc6, 0xc6, 0xe6, 0xdc, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc0, 0xc6,
-    0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x06, 0x76, 0xce, 0xc6,
-    0xc6, 0xc6, 0xc6, 0xce, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x7c, 0xc6, 0xc6, 0xfe, 0xc0, 0xc0, 0xc0, 0x7e, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x1c, 0x36, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x30,
-    0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xce, 0xc6,
-    0xc6, 0xc6, 0xce, 0x76, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0xc0, 0xc0,
-    0xc0, 0xdc, 0xe6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x18, 0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x1e, 0x06, 0x06,
-    0x06, 0x06, 0x06, 0x06, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0xc0, 0xc0,
-    0xc0, 0xc6, 0xcc, 0xd8, 0xf0, 0xf0, 0xd8, 0xcc, 0xc6, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0xfe, 0xd6,
-    0xd6, 0xd6, 0xd6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xdc, 0xe6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
-    0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0xe6, 0xc6,
-    0xc6, 0xc6, 0xe6, 0xdc, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x76, 0xce, 0xc6, 0xc6, 0xc6, 0xce, 0x76, 0x06, 0x06, 0x06, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0xe6, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-    0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0,
-    0x70, 0x1c, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30,
-    0x30, 0xfe, 0x30, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
-    0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6,
-    0xc6, 0xc6, 0x6c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0x6c, 0x38, 0x38, 0x6c, 0xc6,
-    0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6,
-    0xc6, 0xc6, 0xce, 0x76, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xfe, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0xfe, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x1c, 0x30, 0x30, 0x30, 0x30, 0xe0, 0x30, 0x30, 0x30, 0x30,
-    0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x30, 0x00,
-    0x30, 0x30, 0x30, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x30,
-    0x30, 0x30, 0x30, 0x1c, 0x30, 0x30, 0x30, 0x30, 0xe0, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x38, 0x38, 0x6c,
-    0x6c, 0xc6, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66,
-    0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x66, 0x3c, 0x18, 0xcc, 0x78, 0x00,
-    0x00, 0x00, 0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
-    0x7c, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x18, 0x30, 0x00, 0x7c, 0xc6, 0xc6,
-    0xfe, 0xc0, 0xc0, 0xc0, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c,
-    0x00, 0x7c, 0x06, 0x06, 0x7e, 0xc6, 0xc6, 0xc6, 0x7e, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0x06, 0x06, 0x7e, 0xc6, 0xc6, 0xc6,
-    0x7e, 0x00, 0x00, 0x00, 0x00, 0x60, 0x30, 0x18, 0x00, 0x7c, 0x06, 0x06,
-    0x7e, 0xc6, 0xc6, 0xc6, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x38,
-    0x00, 0x7c, 0x06, 0x06, 0x7e, 0xc6, 0xc6, 0xc6, 0x7e, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc0, 0xc6,
-    0x7c, 0x18, 0x0c, 0x38, 0x00, 0x10, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xc6,
-    0xfe, 0xc0, 0xc0, 0xc0, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c,
-    0x00, 0x7c, 0xc6, 0xc6, 0xfe, 0xc0, 0xc0, 0xc0, 0x7e, 0x00, 0x00, 0x00,
-    0x00, 0x60, 0x30, 0x18, 0x00, 0x7c, 0xc6, 0xc6, 0xfe, 0xc0, 0xc0, 0xc0,
-    0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x00, 0x38, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c,
-    0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00,
-    0x00, 0x60, 0x30, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x3c, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xc6,
-    0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x38, 0x00,
-    0x38, 0x6c, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00,
-    0x18, 0x30, 0x60, 0x00, 0xfe, 0xc0, 0xc0, 0xfc, 0xc0, 0xc0, 0xc0, 0xc0,
-    0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0x36, 0x36,
-    0x76, 0xde, 0xd8, 0xd8, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x3c,
-    0x6c, 0xcc, 0xcc, 0xfe, 0xcc, 0xcc, 0xcc, 0xcc, 0xce, 0x00, 0x00, 0x00,
-    0x00, 0x10, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
-    0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xc6,
-    0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x60, 0x30, 0x18,
-    0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00,
-    0x00, 0x10, 0x38, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
-    0x7c, 0x00, 0x00, 0x00, 0x00, 0x60, 0x30, 0x18, 0x00, 0xc6, 0xc6, 0xc6,
-    0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c,
-    0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xce, 0x76, 0x06, 0xc6, 0x7c, 0x00,
-    0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
-    0x7c, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
-    0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30,
-    0x30, 0x78, 0xcc, 0xc0, 0xc0, 0xcc, 0x78, 0x30, 0x30, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x38, 0x6c, 0x60, 0x60, 0x60, 0xf8, 0x60, 0x60, 0x60, 0xe6,
-    0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0x78, 0x30, 0xfc,
-    0x30, 0xfc, 0x30, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xcc,
-    0xcc, 0xf8, 0xc4, 0xcc, 0xde, 0xcc, 0xcc, 0xcc, 0xc6, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x0e, 0x1b, 0x18, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0xd8, 0x70, 0x00, 0x00, 0x0c, 0x18, 0x30, 0x00, 0x7c, 0x06, 0x06,
-    0x7e, 0xc6, 0xc6, 0xc6, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x18, 0x30,
-    0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00,
-    0x00, 0x0c, 0x18, 0x30, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
-    0x7c, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x18, 0x30, 0x00, 0xc6, 0xc6, 0xc6,
-    0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00,
-    0x00, 0xdc, 0xe6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00,
-    0x76, 0xdc, 0x00, 0xc6, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6,
-    0xc6, 0x00, 0x00, 0x00, 0x00, 0x78, 0xd8, 0xd8, 0x6c, 0x00, 0xfc, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x6c,
-    0x38, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x18, 0x18, 0x00, 0x18, 0x18, 0x30, 0x60, 0xc0, 0xc6, 0xc6,
-    0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xfe, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xfe, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xc0, 0xc2, 0xc6, 0xcc, 0xd8, 0x30, 0x60, 0xdc, 0x86, 0x0c,
-    0x18, 0x3e, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc2, 0xc6, 0xcc, 0xd8, 0x30,
-    0x66, 0xce, 0x9e, 0x3e, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30,
-    0x00, 0x30, 0x30, 0x30, 0x78, 0x78, 0x78, 0x78, 0x30, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x6c, 0xd8, 0x6c, 0x36, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x6c, 0x36,
-    0x6c, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x88, 0x22, 0x88,
-    0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88,
-    0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa,
-    0x55, 0xaa, 0x55, 0xaa, 0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77,
-    0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0xf8, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0xf8, 0x18,
-    0x18, 0xf8, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0xf6, 0xf6, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf8, 0x18,
-    0x18, 0xf8, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0xf6, 0xf6, 0x06, 0x06, 0xf6, 0xf6, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0x06,
-    0x06, 0xf6, 0xf6, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0xf6, 0xf6, 0x06, 0x06, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xfe, 0xfe, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0xf8, 0x18,
-    0x18, 0xf8, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0xf8, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x1f, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff,
-    0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0xff, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x1f, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
-    0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0xff, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x1f, 0x18, 0x18, 0x1f, 0x1f, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x37,
-    0x37, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x37, 0x37, 0x30, 0x30, 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x30, 0x30, 0x37, 0x37, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xf7, 0xf7, 0x00,
-    0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xff, 0xff, 0x00, 0x00, 0xf7, 0xf7, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x37, 0x37, 0x30, 0x30, 0x37, 0x37, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00,
-    0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0xf7, 0xf7, 0x00, 0x00, 0xf7, 0xf7, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xff,
-    0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x3f,
-    0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x1f, 0x1f, 0x18, 0x18, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x18, 0x18, 0x1f, 0x1f, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f,
-    0x3f, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0xff, 0xff, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0xff, 0x18, 0x18, 0xff, 0xff, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8,
-    0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x1f, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xf0, 0xf0, 0xf0,
-    0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
-    0x0f, 0x0f, 0x0f, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x76, 0xd6, 0xdc, 0xc8, 0xc8, 0xdc, 0xd6, 0x76, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x78, 0xcc, 0xcc, 0xcc, 0xd8, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
-    0xd8, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0xfe, 0xc6, 0xc6, 0xc0, 0xc0, 0xc0,
-    0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x7e, 0xfe, 0x24, 0x24, 0x24, 0x24, 0x66, 0xc6, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xfe, 0xfe, 0xc2, 0x60, 0x30, 0x18, 0x30, 0x60, 0xc2, 0xfe,
-    0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xc8, 0xcc,
-    0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x76, 0x6c, 0x60, 0xc0, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0xfc, 0x98, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x30, 0x30, 0x78, 0xcc, 0xcc,
-    0xcc, 0x78, 0x30, 0x30, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c,
-    0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x6c, 0x38, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x38, 0x6c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x6c, 0x6c, 0x6c,
-    0xee, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xcc, 0x60, 0x30, 0x78, 0xcc,
-    0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x76, 0xbb, 0x99, 0x99, 0xdd, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x02, 0x06, 0x3c, 0x6c, 0xce, 0xd6, 0xd6, 0xe6, 0x6c, 0x78,
-    0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x30, 0x60, 0xc0, 0xc0, 0xfe,
-    0xc0, 0xc0, 0x60, 0x30, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c,
-    0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0xfc,
-    0x30, 0x30, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x60, 0x30, 0x18, 0x0c, 0x18, 0x30, 0x60, 0x00, 0xfc, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x60, 0xc0, 0x60, 0x30, 0x18, 0x00,
-    0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x36, 0x36, 0x30, 0x30, 0x30,
-    0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x00, 0xfc, 0x00, 0x30, 0x30, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00,
-    0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xcc, 0xcc,
-    0xcc, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0c, 0x0c,
-    0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xcc, 0x6c, 0x3c, 0x1c, 0x0c, 0x00, 0x00,
-    0x00, 0xd8, 0xec, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x0c, 0x18, 0x30, 0x60, 0x7c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00};
-
-static ALWAYS_INLINE uint32_t convert_colour(struct flanterm_context *_ctx,
-                                             uint32_t colour) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-  uint32_t r = (colour >> 16) & 0xff;
-  uint32_t g = (colour >> 8) & 0xff;
-  uint32_t b = colour & 0xff;
-  return (r << ctx->red_mask_shift) | (g << ctx->green_mask_shift) |
-         (b << ctx->blue_mask_shift);
-}
-
-static void flanterm_fb_save_state(struct flanterm_context *_ctx) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-  ctx->saved_state_text_fg = ctx->text_fg;
-  ctx->saved_state_text_bg = ctx->text_bg;
-  ctx->saved_state_cursor_x = ctx->cursor_x;
-  ctx->saved_state_cursor_y = ctx->cursor_y;
-}
-
-static void flanterm_fb_restore_state(struct flanterm_context *_ctx) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-  ctx->text_fg = ctx->saved_state_text_fg;
-  ctx->text_bg = ctx->saved_state_text_bg;
-  ctx->cursor_x = ctx->saved_state_cursor_x;
-  ctx->cursor_y = ctx->saved_state_cursor_y;
-}
-
-static void flanterm_fb_swap_palette(struct flanterm_context *_ctx) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-  uint32_t tmp = ctx->text_bg;
-  ctx->text_bg = ctx->text_fg;
-  ctx->text_fg = tmp;
-}
-
-static void plot_char_scaled_canvas(struct flanterm_context *_ctx,
-                                    struct flanterm_fb_char *c, size_t x,
-                                    size_t y) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  if (x >= _ctx->cols || y >= _ctx->rows) {
-    return;
-  }
-
-  x = ctx->offset_x + x * ctx->glyph_width;
-  y = ctx->offset_y + y * ctx->glyph_height;
-
-  bool *glyph = &ctx->font_bool[c->c * ctx->font_height * ctx->font_width];
-  // naming: fx,fy for font coordinates, gx,gy for glyph coordinates
-  for (size_t gy = 0; gy < ctx->glyph_height; gy++) {
-    uint8_t fy = gy / ctx->font_scale_y;
-    volatile uint32_t *fb_line =
-        ctx->framebuffer + x + (y + gy) * (ctx->pitch / 4);
-    uint32_t *canvas_line = ctx->canvas + x + (y + gy) * ctx->width;
-    bool *glyph_pointer = glyph + (fy * ctx->font_width);
-    for (size_t fx = 0; fx < ctx->font_width; fx++) {
-      for (size_t i = 0; i < ctx->font_scale_x; i++) {
-        size_t gx = ctx->font_scale_x * fx + i;
-        uint32_t bg = c->bg == 0xffffffff ? canvas_line[gx] : c->bg;
-        uint32_t fg = c->fg == 0xffffffff ? canvas_line[gx] : c->fg;
-        fb_line[gx] = *glyph_pointer ? fg : bg;
-      }
-      glyph_pointer++;
-    }
-  }
-}
-
-static void plot_char_scaled_uncanvas(struct flanterm_context *_ctx,
-                                      struct flanterm_fb_char *c, size_t x,
-                                      size_t y) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  if (x >= _ctx->cols || y >= _ctx->rows) {
-    return;
-  }
-
-  uint32_t default_bg = ctx->default_bg;
-
-  uint32_t bg = c->bg == 0xffffffff ? default_bg : c->bg;
-  uint32_t fg = c->fg == 0xffffffff ? default_bg : c->fg;
-
-  x = ctx->offset_x + x * ctx->glyph_width;
-  y = ctx->offset_y + y * ctx->glyph_height;
-
-  bool *glyph = &ctx->font_bool[c->c * ctx->font_height * ctx->font_width];
-  // naming: fx,fy for font coordinates, gx,gy for glyph coordinates
-  for (size_t gy = 0; gy < ctx->glyph_height; gy++) {
-    uint8_t fy = gy / ctx->font_scale_y;
-    volatile uint32_t *fb_line =
-        ctx->framebuffer + x + (y + gy) * (ctx->pitch / 4);
-    bool *glyph_pointer = glyph + (fy * ctx->font_width);
-    for (size_t fx = 0; fx < ctx->font_width; fx++) {
-      for (size_t i = 0; i < ctx->font_scale_x; i++) {
-        size_t gx = ctx->font_scale_x * fx + i;
-        fb_line[gx] = *glyph_pointer ? fg : bg;
-      }
-      glyph_pointer++;
-    }
-  }
-}
-
-static void plot_char_unscaled_canvas(struct flanterm_context *_ctx,
-                                      struct flanterm_fb_char *c, size_t x,
-                                      size_t y) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  if (x >= _ctx->cols || y >= _ctx->rows) {
-    return;
-  }
-
-  x = ctx->offset_x + x * ctx->glyph_width;
-  y = ctx->offset_y + y * ctx->glyph_height;
-
-  bool *glyph = &ctx->font_bool[c->c * ctx->font_height * ctx->font_width];
-  // naming: fx,fy for font coordinates, gx,gy for glyph coordinates
-  for (size_t gy = 0; gy < ctx->glyph_height; gy++) {
-    volatile uint32_t *fb_line =
-        ctx->framebuffer + x + (y + gy) * (ctx->pitch / 4);
-    uint32_t *canvas_line = ctx->canvas + x + (y + gy) * ctx->width;
-    bool *glyph_pointer = glyph + (gy * ctx->font_width);
-    for (size_t fx = 0; fx < ctx->font_width; fx++) {
-      uint32_t bg = c->bg == 0xffffffff ? canvas_line[fx] : c->bg;
-      uint32_t fg = c->fg == 0xffffffff ? canvas_line[fx] : c->fg;
-      fb_line[fx] = *(glyph_pointer++) ? fg : bg;
-    }
-  }
-}
-
-static void plot_char_unscaled_uncanvas(struct flanterm_context *_ctx,
-                                        struct flanterm_fb_char *c, size_t x,
-                                        size_t y) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  if (x >= _ctx->cols || y >= _ctx->rows) {
-    return;
-  }
-
-  uint32_t default_bg = ctx->default_bg;
-
-  uint32_t bg = c->bg == 0xffffffff ? default_bg : c->bg;
-  uint32_t fg = c->fg == 0xffffffff ? default_bg : c->fg;
-
-  x = ctx->offset_x + x * ctx->glyph_width;
-  y = ctx->offset_y + y * ctx->glyph_height;
-
-  bool *glyph = &ctx->font_bool[c->c * ctx->font_height * ctx->font_width];
-  // naming: fx,fy for font coordinates, gx,gy for glyph coordinates
-  for (size_t gy = 0; gy < ctx->glyph_height; gy++) {
-    volatile uint32_t *fb_line =
-        ctx->framebuffer + x + (y + gy) * (ctx->pitch / 4);
-    bool *glyph_pointer = glyph + (gy * ctx->font_width);
-    for (size_t fx = 0; fx < ctx->font_width; fx++) {
-      fb_line[fx] = *(glyph_pointer++) ? fg : bg;
-    }
-  }
-}
-
-static inline bool compare_char(struct flanterm_fb_char *a,
-                                struct flanterm_fb_char *b) {
-  return !(a->c != b->c || a->bg != b->bg || a->fg != b->fg);
-}
-
-static void push_to_queue(struct flanterm_context *_ctx,
-                          struct flanterm_fb_char *c, size_t x, size_t y) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  if (x >= _ctx->cols || y >= _ctx->rows) {
-    return;
-  }
-
-  size_t i = y * _ctx->cols + x;
-
-  struct flanterm_fb_queue_item *q = ctx->map[i];
-
-  if (q == NULL) {
-    if (compare_char(&ctx->grid[i], c)) {
-      return;
-    }
-    q = &ctx->queue[ctx->queue_i++];
-    q->x = x;
-    q->y = y;
-    ctx->map[i] = q;
-  }
-
-  q->c = *c;
-}
-
-static void flanterm_fb_revscroll(struct flanterm_context *_ctx) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  for (size_t i = (_ctx->scroll_bottom_margin - 1) * _ctx->cols - 1;
-       i >= _ctx->scroll_top_margin * _ctx->cols; i--) {
-    if (i == (size_t)-1) {
-      break;
-    }
-    struct flanterm_fb_char *c;
-    struct flanterm_fb_queue_item *q = ctx->map[i];
-    if (q != NULL) {
-      c = &q->c;
-    } else {
-      c = &ctx->grid[i];
-    }
-    push_to_queue(_ctx, c, (i + _ctx->cols) % _ctx->cols,
-                  (i + _ctx->cols) / _ctx->cols);
-  }
-
-  // Clear the first line of the screen.
-  struct flanterm_fb_char empty;
-  empty.c = ' ';
-  empty.fg = ctx->text_fg;
-  empty.bg = ctx->text_bg;
-  for (size_t i = 0; i < _ctx->cols; i++) {
-    push_to_queue(_ctx, &empty, i, _ctx->scroll_top_margin);
-  }
-}
-
-static void flanterm_fb_scroll(struct flanterm_context *_ctx) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  for (size_t i = (_ctx->scroll_top_margin + 1) * _ctx->cols;
-       i < _ctx->scroll_bottom_margin * _ctx->cols; i++) {
-    struct flanterm_fb_char *c;
-    struct flanterm_fb_queue_item *q = ctx->map[i];
-    if (q != NULL) {
-      c = &q->c;
-    } else {
-      c = &ctx->grid[i];
-    }
-    push_to_queue(_ctx, c, (i - _ctx->cols) % _ctx->cols,
-                  (i - _ctx->cols) / _ctx->cols);
-  }
-
-  // Clear the last line of the screen.
-  struct flanterm_fb_char empty;
-  empty.c = ' ';
-  empty.fg = ctx->text_fg;
-  empty.bg = ctx->text_bg;
-  for (size_t i = 0; i < _ctx->cols; i++) {
-    push_to_queue(_ctx, &empty, i, _ctx->scroll_bottom_margin - 1);
-  }
-}
-
-static void flanterm_fb_clear(struct flanterm_context *_ctx, bool move) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  struct flanterm_fb_char empty;
-  empty.c = ' ';
-  empty.fg = ctx->text_fg;
-  empty.bg = ctx->text_bg;
-  for (size_t i = 0; i < _ctx->rows * _ctx->cols; i++) {
-    push_to_queue(_ctx, &empty, i % _ctx->cols, i / _ctx->cols);
-  }
-
-  if (move) {
-    ctx->cursor_x = 0;
-    ctx->cursor_y = 0;
-  }
-}
-
-static void flanterm_fb_set_cursor_pos(struct flanterm_context *_ctx, size_t x,
-                                       size_t y) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  if (x >= _ctx->cols) {
-    if ((int)x < 0) {
-      x = 0;
-    } else {
-      x = _ctx->cols - 1;
-    }
-  }
-  if (y >= _ctx->rows) {
-    if ((int)y < 0) {
-      y = 0;
-    } else {
-      y = _ctx->rows - 1;
-    }
-  }
-  ctx->cursor_x = x;
-  ctx->cursor_y = y;
-}
-
-static void flanterm_fb_get_cursor_pos(struct flanterm_context *_ctx, size_t *x,
-                                       size_t *y) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  *x = ctx->cursor_x >= _ctx->cols ? _ctx->cols - 1 : ctx->cursor_x;
-  *y = ctx->cursor_y >= _ctx->rows ? _ctx->rows - 1 : ctx->cursor_y;
-}
-
-static void flanterm_fb_move_character(struct flanterm_context *_ctx,
-                                       size_t new_x, size_t new_y, size_t old_x,
-                                       size_t old_y) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  if (old_x >= _ctx->cols || old_y >= _ctx->rows || new_x >= _ctx->cols ||
-      new_y >= _ctx->rows) {
-    return;
-  }
-
-  size_t i = old_x + old_y * _ctx->cols;
-
-  struct flanterm_fb_char *c;
-  struct flanterm_fb_queue_item *q = ctx->map[i];
-  if (q != NULL) {
-    c = &q->c;
-  } else {
-    c = &ctx->grid[i];
-  }
-
-  push_to_queue(_ctx, c, new_x, new_y);
-}
-
-static void flanterm_fb_set_text_fg(struct flanterm_context *_ctx, size_t fg) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  ctx->text_fg = ctx->ansi_colours[fg];
-}
-
-static void flanterm_fb_set_text_bg(struct flanterm_context *_ctx, size_t bg) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  ctx->text_bg = ctx->ansi_colours[bg];
-}
-
-static void flanterm_fb_set_text_fg_bright(struct flanterm_context *_ctx,
-                                           size_t fg) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  ctx->text_fg = ctx->ansi_bright_colours[fg];
-}
-
-static void flanterm_fb_set_text_bg_bright(struct flanterm_context *_ctx,
-                                           size_t bg) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  ctx->text_bg = ctx->ansi_bright_colours[bg];
-}
-
-static void flanterm_fb_set_text_fg_rgb(struct flanterm_context *_ctx,
-                                        uint32_t fg) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  ctx->text_fg = convert_colour(_ctx, fg);
-}
-
-static void flanterm_fb_set_text_bg_rgb(struct flanterm_context *_ctx,
-                                        uint32_t bg) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  ctx->text_bg = convert_colour(_ctx, bg);
-}
-
-static void flanterm_fb_set_text_fg_default(struct flanterm_context *_ctx) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  ctx->text_fg = ctx->default_fg;
-}
-
-static void flanterm_fb_set_text_bg_default(struct flanterm_context *_ctx) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  ctx->text_bg = 0xffffffff;
-}
-
-static void
-flanterm_fb_set_text_fg_default_bright(struct flanterm_context *_ctx) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  ctx->text_fg = ctx->default_fg_bright;
-}
-
-static void
-flanterm_fb_set_text_bg_default_bright(struct flanterm_context *_ctx) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  ctx->text_bg = ctx->default_bg_bright;
-}
-
-static void draw_cursor(struct flanterm_context *_ctx) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  if (ctx->cursor_x >= _ctx->cols || ctx->cursor_y >= _ctx->rows) {
-    return;
-  }
-
-  size_t i = ctx->cursor_x + ctx->cursor_y * _ctx->cols;
-
-  struct flanterm_fb_char c;
-  struct flanterm_fb_queue_item *q = ctx->map[i];
-  if (q != NULL) {
-    c = q->c;
-  } else {
-    c = ctx->grid[i];
-  }
-  uint32_t tmp = c.fg;
-  c.fg = c.bg;
-  c.bg = tmp;
-  ctx->plot_char(_ctx, &c, ctx->cursor_x, ctx->cursor_y);
-  if (q != NULL) {
-    ctx->grid[i] = q->c;
-    ctx->map[i] = NULL;
-  }
-}
-
-static void flanterm_fb_double_buffer_flush(struct flanterm_context *_ctx) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  if (_ctx->cursor_enabled) {
-    draw_cursor(_ctx);
-  }
-
-  for (size_t i = 0; i < ctx->queue_i; i++) {
-    struct flanterm_fb_queue_item *q = &ctx->queue[i];
-    size_t offset = q->y * _ctx->cols + q->x;
-    if (ctx->map[offset] == NULL) {
-      continue;
-    }
-    ctx->plot_char(_ctx, &q->c, q->x, q->y);
-    ctx->grid[offset] = q->c;
-    ctx->map[offset] = NULL;
-  }
-
-  if ((ctx->old_cursor_x != ctx->cursor_x ||
-       ctx->old_cursor_y != ctx->cursor_y) ||
-      _ctx->cursor_enabled == false) {
-    if (ctx->old_cursor_x < _ctx->cols && ctx->old_cursor_y < _ctx->rows) {
-      ctx->plot_char(
-          _ctx, &ctx->grid[ctx->old_cursor_x + ctx->old_cursor_y * _ctx->cols],
-          ctx->old_cursor_x, ctx->old_cursor_y);
-    }
-  }
-
-  ctx->old_cursor_x = ctx->cursor_x;
-  ctx->old_cursor_y = ctx->cursor_y;
-
-  ctx->queue_i = 0;
-}
-
-static void flanterm_fb_raw_putchar(struct flanterm_context *_ctx, uint8_t c) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  if (ctx->cursor_x >= _ctx->cols &&
-      (ctx->cursor_y < _ctx->scroll_bottom_margin - 1 ||
-       _ctx->scroll_enabled)) {
-    ctx->cursor_x = 0;
-    ctx->cursor_y++;
-    if (ctx->cursor_y == _ctx->scroll_bottom_margin) {
-      ctx->cursor_y--;
-      flanterm_fb_scroll(_ctx);
-    }
-    if (ctx->cursor_y >= _ctx->cols) {
-      ctx->cursor_y = _ctx->cols - 1;
-    }
-  }
-
-  struct flanterm_fb_char ch;
-  ch.c = c;
-  ch.fg = ctx->text_fg;
-  ch.bg = ctx->text_bg;
-  push_to_queue(_ctx, &ch, ctx->cursor_x++, ctx->cursor_y);
-}
-
-static void flanterm_fb_full_refresh(struct flanterm_context *_ctx) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  uint32_t default_bg = ctx->default_bg;
-
-  for (size_t y = 0; y < ctx->height; y++) {
-    for (size_t x = 0; x < ctx->width; x++) {
-      if (ctx->canvas != NULL) {
-        ctx->framebuffer[y * (ctx->pitch / sizeof(uint32_t)) + x] =
-            ctx->canvas[y * ctx->width + x];
-      } else {
-        ctx->framebuffer[y * (ctx->pitch / sizeof(uint32_t)) + x] = default_bg;
-      }
-    }
-  }
-
-  for (size_t i = 0; i < (size_t)_ctx->rows * _ctx->cols; i++) {
-    size_t x = i % _ctx->cols;
-    size_t y = i / _ctx->cols;
-
-    ctx->plot_char(_ctx, &ctx->grid[i], x, y);
-  }
-
-  if (_ctx->cursor_enabled) {
-    draw_cursor(_ctx);
-  }
-}
-
-static void flanterm_fb_deinit(struct flanterm_context *_ctx,
-                               void (*_free)(void *, size_t)) {
-  struct flanterm_fb_context *ctx = (void *)_ctx;
-
-  if (_free == NULL) {
-#ifndef FLANTERM_FB_DISABLE_BUMP_ALLOC
-    if (bump_allocated_instance == true) {
-      bump_alloc_ptr = 0;
-      bump_allocated_instance = false;
-    }
-#endif
-    return;
-  }
-
-  _free(ctx->font_bits, ctx->font_bits_size);
-  _free(ctx->font_bool, ctx->font_bool_size);
-  _free(ctx->grid, ctx->grid_size);
-  _free(ctx->queue, ctx->queue_size);
-  _free(ctx->map, ctx->map_size);
-
-  if (ctx->canvas != NULL) {
-    _free(ctx->canvas, ctx->canvas_size);
-  }
-
-  _free(ctx, sizeof(struct flanterm_fb_context));
-}
-
-struct flanterm_context *flanterm_fb_init(
-    void *(*_malloc)(size_t), void (*_free)(void *, size_t),
-    uint32_t *framebuffer, size_t width, size_t height, size_t pitch,
-    uint8_t red_mask_size, uint8_t red_mask_shift, uint8_t green_mask_size,
-    uint8_t green_mask_shift, uint8_t blue_mask_size, uint8_t blue_mask_shift,
-    uint32_t *canvas, uint32_t *ansi_colours, uint32_t *ansi_bright_colours,
-    uint32_t *default_bg, uint32_t *default_fg, uint32_t *default_bg_bright,
-    uint32_t *default_fg_bright, void *font, size_t font_width,
-    size_t font_height, size_t font_spacing, size_t font_scale_x,
-    size_t font_scale_y, size_t margin) {
-  if (font_scale_x == 0 || font_scale_y == 0) {
-    font_scale_x = 1;
-    font_scale_y = 1;
-    if (width >= (1920 + 1920 / 3) && height >= (1080 + 1080 / 3)) {
-      font_scale_x = 2;
-      font_scale_y = 2;
-    }
-    if (width >= (3840 + 3840 / 3) && height >= (2160 + 2160 / 3)) {
-      font_scale_x = 4;
-      font_scale_y = 4;
-    }
-  }
-
-  /*if (red_mask_size < 8 || red_mask_size != green_mask_size || red_mask_size
-  != blue_mask_size) { return NULL;
-  }*/
-
-  if (_malloc == NULL) {
-#ifndef FLANTERM_FB_DISABLE_BUMP_ALLOC
-    if (bump_allocated_instance == true) {
-      return NULL;
-    }
-    _malloc = bump_alloc;
-    // Limit terminal size if needed
-    if (width > FLANTERM_FB_WIDTH_LIMIT || height > FLANTERM_FB_HEIGHT_LIMIT) {
-      size_t width_limit =
-          width > FLANTERM_FB_WIDTH_LIMIT ? FLANTERM_FB_WIDTH_LIMIT : width;
-      size_t height_limit =
-          height > FLANTERM_FB_HEIGHT_LIMIT ? FLANTERM_FB_HEIGHT_LIMIT : height;
-
-      framebuffer =
-          (uint32_t *)((uintptr_t)framebuffer +
-                       ((((height / 2) - (height_limit / 2)) * pitch) +
-                        (((width / 2) - (width_limit / 2)) * 4)));
-
-      width = width_limit;
-      height = height_limit;
-    }
-
-    // Force disable canvas
-    canvas = NULL;
-#else
-    return NULL;
-#endif
-  }
-
-  struct flanterm_fb_context *ctx = NULL;
-  ctx = _malloc(sizeof(struct flanterm_fb_context));
-  if (ctx == NULL) {
-    goto fail;
-  }
-
-  struct flanterm_context *_ctx = (void *)ctx;
-  memset(ctx, 0, sizeof(struct flanterm_fb_context));
-
-  ctx->red_mask_size = red_mask_size;
-  ctx->red_mask_shift = red_mask_shift + (red_mask_size - 8);
-  ctx->green_mask_size = green_mask_size;
-  ctx->green_mask_shift = green_mask_shift + (green_mask_size - 8);
-  ctx->blue_mask_size = blue_mask_size;
-  ctx->blue_mask_shift = blue_mask_shift + (blue_mask_size - 8);
-
-  if (ansi_colours != NULL) {
-    for (size_t i = 0; i < 8; i++) {
-      ctx->ansi_colours[i] = convert_colour(_ctx, ansi_colours[i]);
-    }
-  } else {
-    ctx->ansi_colours[0] = convert_colour(_ctx, 0x00000000); // black
-    ctx->ansi_colours[1] = convert_colour(_ctx, 0x00aa0000); // red
-    ctx->ansi_colours[2] = convert_colour(_ctx, 0x0000aa00); // green
-    ctx->ansi_colours[3] = convert_colour(_ctx, 0x00aa5500); // brown
-    ctx->ansi_colours[4] = convert_colour(_ctx, 0x000000aa); // blue
-    ctx->ansi_colours[5] = convert_colour(_ctx, 0x00aa00aa); // magenta
-    ctx->ansi_colours[6] = convert_colour(_ctx, 0x0000aaaa); // cyan
-    ctx->ansi_colours[7] = convert_colour(_ctx, 0x00aaaaaa); // grey
-  }
-
-  if (ansi_bright_colours != NULL) {
-    for (size_t i = 0; i < 8; i++) {
-      ctx->ansi_bright_colours[i] =
-          convert_colour(_ctx, ansi_bright_colours[i]);
-    }
-  } else {
-    ctx->ansi_bright_colours[0] = convert_colour(_ctx, 0x00555555); // black
-    ctx->ansi_bright_colours[1] = convert_colour(_ctx, 0x00ff5555); // red
-    ctx->ansi_bright_colours[2] = convert_colour(_ctx, 0x0055ff55); // green
-    ctx->ansi_bright_colours[3] = convert_colour(_ctx, 0x00ffff55); // brown
-    ctx->ansi_bright_colours[4] = convert_colour(_ctx, 0x005555ff); // blue
-    ctx->ansi_bright_colours[5] = convert_colour(_ctx, 0x00ff55ff); // magenta
-    ctx->ansi_bright_colours[6] = convert_colour(_ctx, 0x0055ffff); // cyan
-    ctx->ansi_bright_colours[7] = convert_colour(_ctx, 0x00ffffff); // grey
-  }
-
-  if (default_bg != NULL) {
-    ctx->default_bg = convert_colour(_ctx, *default_bg);
-  } else {
-    ctx->default_bg = 0x00000000; // background (black)
-  }
-
-  if (default_fg != NULL) {
-    ctx->default_fg = convert_colour(_ctx, *default_fg);
-  } else {
-    ctx->default_fg = convert_colour(_ctx, 0x00aaaaaa); // foreground (grey)
-  }
-
-  if (default_bg_bright != NULL) {
-    ctx->default_bg_bright = convert_colour(_ctx, *default_bg_bright);
-  } else {
-    ctx->default_bg_bright =
-        convert_colour(_ctx, 0x00555555); // background (black)
-  }
-
-  if (default_fg_bright != NULL) {
-    ctx->default_fg_bright = convert_colour(_ctx, *default_fg_bright);
-  } else {
-    ctx->default_fg_bright =
-        convert_colour(_ctx, 0x00ffffff); // foreground (grey)
-  }
-
-  ctx->text_fg = ctx->default_fg;
-  ctx->text_bg = 0xffffffff;
-
-  ctx->framebuffer = (void *)framebuffer;
-  ctx->width = width;
-  ctx->height = height;
-  ctx->pitch = pitch;
-
-#define FONT_BYTES ((font_width * font_height * FLANTERM_FB_FONT_GLYPHS) / 8)
-
-  if (font != NULL) {
-    ctx->font_width = font_width;
-    ctx->font_height = font_height;
-    ctx->font_bits_size = FONT_BYTES;
-    ctx->font_bits = _malloc(ctx->font_bits_size);
-    if (ctx->font_bits == NULL) {
-      goto fail;
-    }
-    memcpy(ctx->font_bits, font, ctx->font_bits_size);
-  } else {
-    ctx->font_width = font_width = 8;
-    ctx->font_height = font_height = 16;
-    ctx->font_bits_size = FONT_BYTES;
-    font_spacing = 1;
-    ctx->font_bits = _malloc(ctx->font_bits_size);
-    if (ctx->font_bits == NULL) {
-      goto fail;
-    }
-    memcpy(ctx->font_bits, builtin_font, ctx->font_bits_size);
-  }
-
-#undef FONT_BYTES
-
-  ctx->font_width += font_spacing;
-
-  ctx->font_bool_size =
-      FLANTERM_FB_FONT_GLYPHS * font_height * ctx->font_width * sizeof(bool);
-  ctx->font_bool = _malloc(ctx->font_bool_size);
-  if (ctx->font_bool == NULL) {
-    goto fail;
-  }
-
-  for (size_t i = 0; i < FLANTERM_FB_FONT_GLYPHS; i++) {
-    uint8_t *glyph = &ctx->font_bits[i * font_height];
-
-    for (size_t y = 0; y < font_height; y++) {
-      // NOTE: the characters in VGA fonts are always one byte wide.
-      // 9 dot wide fonts have 8 dots and one empty column, except
-      // characters 0xC0-0xDF replicate column 9.
-      for (size_t x = 0; x < 8; x++) {
-        size_t offset =
-            i * font_height * ctx->font_width + y * ctx->font_width + x;
-
-        if ((glyph[y] & (0x80 >> x))) {
-          ctx->font_bool[offset] = true;
-        } else {
-          ctx->font_bool[offset] = false;
-        }
-      }
-      // fill columns above 8 like VGA Line Graphics Mode does
-      for (size_t x = 8; x < ctx->font_width; x++) {
-        size_t offset =
-            i * font_height * ctx->font_width + y * ctx->font_width + x;
-
-        if (i >= 0xc0 && i <= 0xdf) {
-          ctx->font_bool[offset] = (glyph[y] & 1);
-        } else {
-          ctx->font_bool[offset] = false;
-        }
-      }
-    }
-  }
-
-  ctx->font_scale_x = font_scale_x;
-  ctx->font_scale_y = font_scale_y;
-
-  ctx->glyph_width = ctx->font_width * font_scale_x;
-  ctx->glyph_height = font_height * font_scale_y;
-
-  _ctx->cols = (ctx->width - margin * 2) / ctx->glyph_width;
-  _ctx->rows = (ctx->height - margin * 2) / ctx->glyph_height;
-
-  ctx->offset_x = margin + ((ctx->width - margin * 2) % ctx->glyph_width) / 2;
-  ctx->offset_y = margin + ((ctx->height - margin * 2) % ctx->glyph_height) / 2;
-
-  ctx->grid_size = _ctx->rows * _ctx->cols * sizeof(struct flanterm_fb_char);
-  ctx->grid = _malloc(ctx->grid_size);
-  if (ctx->grid == NULL) {
-    goto fail;
-  }
-  for (size_t i = 0; i < _ctx->rows * _ctx->cols; i++) {
-    ctx->grid[i].c = ' ';
-    ctx->grid[i].fg = ctx->text_fg;
-    ctx->grid[i].bg = ctx->text_bg;
-  }
-
-  ctx->queue_size =
-      _ctx->rows * _ctx->cols * sizeof(struct flanterm_fb_queue_item);
-  ctx->queue = _malloc(ctx->queue_size);
-  if (ctx->queue == NULL) {
-    goto fail;
-  }
-  ctx->queue_i = 0;
-  memset(ctx->queue, 0, ctx->queue_size);
-
-  ctx->map_size =
-      _ctx->rows * _ctx->cols * sizeof(struct flanterm_fb_queue_item *);
-  ctx->map = _malloc(ctx->map_size);
-  if (ctx->map == NULL) {
-    goto fail;
-  }
-  memset(ctx->map, 0, ctx->map_size);
-
-  if (canvas != NULL) {
-    ctx->canvas_size = ctx->width * ctx->height * sizeof(uint32_t);
-    ctx->canvas = _malloc(ctx->canvas_size);
-    if (ctx->canvas == NULL) {
-      goto fail;
-    }
-    for (size_t i = 0; i < ctx->width * ctx->height; i++) {
-      ctx->canvas[i] = convert_colour(_ctx, canvas[i]);
-    }
-  }
-
-  if (font_scale_x == 1 && font_scale_y == 1) {
-    if (canvas == NULL) {
-      ctx->plot_char = plot_char_unscaled_uncanvas;
-    } else {
-      ctx->plot_char = plot_char_unscaled_canvas;
-    }
-  } else {
-    if (canvas == NULL) {
-      ctx->plot_char = plot_char_scaled_uncanvas;
-    } else {
-      ctx->plot_char = plot_char_scaled_canvas;
-    }
-  }
-
-  _ctx->raw_putchar = flanterm_fb_raw_putchar;
-  _ctx->clear = flanterm_fb_clear;
-  _ctx->set_cursor_pos = flanterm_fb_set_cursor_pos;
-  _ctx->get_cursor_pos = flanterm_fb_get_cursor_pos;
-  _ctx->set_text_fg = flanterm_fb_set_text_fg;
-  _ctx->set_text_bg = flanterm_fb_set_text_bg;
-  _ctx->set_text_fg_bright = flanterm_fb_set_text_fg_bright;
-  _ctx->set_text_bg_bright = flanterm_fb_set_text_bg_bright;
-  _ctx->set_text_fg_rgb = flanterm_fb_set_text_fg_rgb;
-  _ctx->set_text_bg_rgb = flanterm_fb_set_text_bg_rgb;
-  _ctx->set_text_fg_default = flanterm_fb_set_text_fg_default;
-  _ctx->set_text_bg_default = flanterm_fb_set_text_bg_default;
-  _ctx->set_text_fg_default_bright = flanterm_fb_set_text_fg_default_bright;
-  _ctx->set_text_bg_default_bright = flanterm_fb_set_text_bg_default_bright;
-  _ctx->move_character = flanterm_fb_move_character;
-  _ctx->scroll = flanterm_fb_scroll;
-  _ctx->revscroll = flanterm_fb_revscroll;
-  _ctx->swap_palette = flanterm_fb_swap_palette;
-  _ctx->save_state = flanterm_fb_save_state;
-  _ctx->restore_state = flanterm_fb_restore_state;
-  _ctx->double_buffer_flush = flanterm_fb_double_buffer_flush;
-  _ctx->full_refresh = flanterm_fb_full_refresh;
-  _ctx->deinit = flanterm_fb_deinit;
-
-  flanterm_context_reinit(_ctx);
-  flanterm_fb_full_refresh(_ctx);
-
-#ifndef FLANTERM_FB_DISABLE_BUMP_ALLOC
-  if (_malloc == bump_alloc) {
-    bump_allocated_instance = true;
-  }
-#endif
-
-  return _ctx;
-
-fail:
-  if (ctx == NULL) {
-    return NULL;
-  }
-
-#ifndef FLANTERM_FB_DISABLE_BUMP_ALLOC
-  if (_malloc == bump_alloc) {
-    bump_alloc_ptr = 0;
-    return NULL;
-  }
-#endif
-
-  if (_free == NULL) {
-    return NULL;
-  }
-
-  if (ctx->canvas != NULL) {
-    _free(ctx->canvas, ctx->canvas_size);
-  }
-  if (ctx->map != NULL) {
-    _free(ctx->map, ctx->map_size);
-  }
-  if (ctx->queue != NULL) {
-    _free(ctx->queue, ctx->queue_size);
-  }
-  if (ctx->grid != NULL) {
-    _free(ctx->grid, ctx->grid_size);
-  }
-  if (ctx->font_bool != NULL) {
-    _free(ctx->font_bool, ctx->font_bool_size);
-  }
-  if (ctx->font_bits != NULL) {
-    _free(ctx->font_bits, ctx->font_bits_size);
-  }
-  if (ctx != NULL) {
-    _free(ctx, sizeof(struct flanterm_fb_context));
-  }
-
-  return NULL;
-}
diff --git a/kernel/src/sys/gfx/flanterm/backends/fb.h b/kernel/src/sys/gfx/flanterm/backends/fb.h
deleted file mode 100644
index b6a2152..0000000
--- a/kernel/src/sys/gfx/flanterm/backends/fb.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright (C) 2022-2025 mintsuki and contributors.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef FLANTERM_FB_H
-#define FLANTERM_FB_H 1
-
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "../flanterm.h"
-
-#ifdef FLANTERM_IN_FLANTERM
-
-#include "fb_private.h"
-
-#endif
-
-struct flanterm_context *flanterm_fb_init(
-    /* If _malloc and _free are nulled, use the bump allocated instance (1 use
-       only). */
-    void *(*_malloc)(size_t size),
-    void (*_free)(void *ptr, size_t size), uint32_t *framebuffer, size_t width,
-    size_t height, size_t pitch, uint8_t red_mask_size, uint8_t red_mask_shift,
-    uint8_t green_mask_size, uint8_t green_mask_shift, uint8_t blue_mask_size,
-    uint8_t blue_mask_shift, uint32_t *canvas, /* If nulled, no canvas. */
-    uint32_t *ansi_colours,
-    uint32_t *ansi_bright_colours,              /* If nulled, default. */
-    uint32_t *default_bg, uint32_t *default_fg, /* If nulled, default. */
-    uint32_t *default_bg_bright,
-    uint32_t *default_fg_bright, /* If nulled, default. */
-    /* If font is null, use default font and font_width and font_height ignored.
-     */
-    void *font, size_t font_width, size_t font_height, size_t font_spacing,
-    /* If scale_x and scale_y are 0, automatically scale font based on
-       resolution. */
-    size_t font_scale_x, size_t font_scale_y, size_t margin);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/kernel/src/sys/gfx/flanterm/backends/fb_private.h b/kernel/src/sys/gfx/flanterm/backends/fb_private.h
deleted file mode 100644
index 5985a6a..0000000
--- a/kernel/src/sys/gfx/flanterm/backends/fb_private.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Copyright (C) 2022-2025 mintsuki and contributors.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef FLANTERM_FB_PRIVATE_H
-#define FLANTERM_FB_PRIVATE_H 1
-
-#ifndef FLANTERM_IN_FLANTERM
-#error "Do not use fb_private.h. Use interfaces defined in fb.h only."
-#endif
-
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define FLANTERM_FB_FONT_GLYPHS 256
-
-struct flanterm_fb_char {
-  uint32_t c;
-  uint32_t fg;
-  uint32_t bg;
-};
-
-struct flanterm_fb_queue_item {
-  size_t x, y;
-  struct flanterm_fb_char c;
-};
-
-struct flanterm_fb_context {
-  struct flanterm_context term;
-
-  void (*plot_char)(struct flanterm_context *ctx, struct flanterm_fb_char *c,
-                    size_t x, size_t y);
-
-  size_t font_width;
-  size_t font_height;
-  size_t glyph_width;
-  size_t glyph_height;
-
-  size_t font_scale_x;
-  size_t font_scale_y;
-
-  size_t offset_x, offset_y;
-
-  volatile uint32_t *framebuffer;
-  size_t pitch;
-  size_t width;
-  size_t height;
-  size_t bpp;
-
-  uint8_t red_mask_size, red_mask_shift;
-  uint8_t green_mask_size, green_mask_shift;
-  uint8_t blue_mask_size, blue_mask_shift;
-
-  size_t font_bits_size;
-  uint8_t *font_bits;
-  size_t font_bool_size;
-  bool *font_bool;
-
-  uint32_t ansi_colours[8];
-  uint32_t ansi_bright_colours[8];
-  uint32_t default_fg, default_bg;
-  uint32_t default_fg_bright, default_bg_bright;
-
-  size_t canvas_size;
-  uint32_t *canvas;
-
-  size_t grid_size;
-  size_t queue_size;
-  size_t map_size;
-
-  struct flanterm_fb_char *grid;
-
-  struct flanterm_fb_queue_item *queue;
-  size_t queue_i;
-
-  struct flanterm_fb_queue_item **map;
-
-  uint32_t text_fg;
-  uint32_t text_bg;
-  size_t cursor_x;
-  size_t cursor_y;
-
-  uint32_t saved_state_text_fg;
-  uint32_t saved_state_text_bg;
-  size_t saved_state_cursor_x;
-  size_t saved_state_cursor_y;
-
-  size_t old_cursor_x;
-  size_t old_cursor_y;
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/kernel/src/sys/gfx/flanterm/flanterm.c b/kernel/src/sys/gfx/flanterm/flanterm.c
deleted file mode 100644
index ae77986..0000000
--- a/kernel/src/sys/gfx/flanterm/flanterm.c
+++ /dev/null
@@ -1,1611 +0,0 @@
-/* Copyright (C) 2022-2025 mintsuki and contributors.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifdef __cplusplus
-#error                                                                         \
-    "Please do not compile Flanterm as C++ code! Flanterm should be compiled as C99 or newer."
-#endif
-
-#ifndef __STDC_VERSION__
-#error "Flanterm must be compiled as C99 or newer."
-#endif
-
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-
-#define FLANTERM_IN_FLANTERM
-
-#include "flanterm.h"
-
-// Tries to implement this standard for terminfo
-// https://man7.org/linux/man-pages/man4/console_codes.4.html
-
-static const uint32_t col256[] = {
-    0x000000, 0x00005f, 0x000087, 0x0000af, 0x0000d7, 0x0000ff, 0x005f00,
-    0x005f5f, 0x005f87, 0x005faf, 0x005fd7, 0x005fff, 0x008700, 0x00875f,
-    0x008787, 0x0087af, 0x0087d7, 0x0087ff, 0x00af00, 0x00af5f, 0x00af87,
-    0x00afaf, 0x00afd7, 0x00afff, 0x00d700, 0x00d75f, 0x00d787, 0x00d7af,
-    0x00d7d7, 0x00d7ff, 0x00ff00, 0x00ff5f, 0x00ff87, 0x00ffaf, 0x00ffd7,
-    0x00ffff, 0x5f0000, 0x5f005f, 0x5f0087, 0x5f00af, 0x5f00d7, 0x5f00ff,
-    0x5f5f00, 0x5f5f5f, 0x5f5f87, 0x5f5faf, 0x5f5fd7, 0x5f5fff, 0x5f8700,
-    0x5f875f, 0x5f8787, 0x5f87af, 0x5f87d7, 0x5f87ff, 0x5faf00, 0x5faf5f,
-    0x5faf87, 0x5fafaf, 0x5fafd7, 0x5fafff, 0x5fd700, 0x5fd75f, 0x5fd787,
-    0x5fd7af, 0x5fd7d7, 0x5fd7ff, 0x5fff00, 0x5fff5f, 0x5fff87, 0x5fffaf,
-    0x5fffd7, 0x5fffff, 0x870000, 0x87005f, 0x870087, 0x8700af, 0x8700d7,
-    0x8700ff, 0x875f00, 0x875f5f, 0x875f87, 0x875faf, 0x875fd7, 0x875fff,
-    0x878700, 0x87875f, 0x878787, 0x8787af, 0x8787d7, 0x8787ff, 0x87af00,
-    0x87af5f, 0x87af87, 0x87afaf, 0x87afd7, 0x87afff, 0x87d700, 0x87d75f,
-    0x87d787, 0x87d7af, 0x87d7d7, 0x87d7ff, 0x87ff00, 0x87ff5f, 0x87ff87,
-    0x87ffaf, 0x87ffd7, 0x87ffff, 0xaf0000, 0xaf005f, 0xaf0087, 0xaf00af,
-    0xaf00d7, 0xaf00ff, 0xaf5f00, 0xaf5f5f, 0xaf5f87, 0xaf5faf, 0xaf5fd7,
-    0xaf5fff, 0xaf8700, 0xaf875f, 0xaf8787, 0xaf87af, 0xaf87d7, 0xaf87ff,
-    0xafaf00, 0xafaf5f, 0xafaf87, 0xafafaf, 0xafafd7, 0xafafff, 0xafd700,
-    0xafd75f, 0xafd787, 0xafd7af, 0xafd7d7, 0xafd7ff, 0xafff00, 0xafff5f,
-    0xafff87, 0xafffaf, 0xafffd7, 0xafffff, 0xd70000, 0xd7005f, 0xd70087,
-    0xd700af, 0xd700d7, 0xd700ff, 0xd75f00, 0xd75f5f, 0xd75f87, 0xd75faf,
-    0xd75fd7, 0xd75fff, 0xd78700, 0xd7875f, 0xd78787, 0xd787af, 0xd787d7,
-    0xd787ff, 0xd7af00, 0xd7af5f, 0xd7af87, 0xd7afaf, 0xd7afd7, 0xd7afff,
-    0xd7d700, 0xd7d75f, 0xd7d787, 0xd7d7af, 0xd7d7d7, 0xd7d7ff, 0xd7ff00,
-    0xd7ff5f, 0xd7ff87, 0xd7ffaf, 0xd7ffd7, 0xd7ffff, 0xff0000, 0xff005f,
-    0xff0087, 0xff00af, 0xff00d7, 0xff00ff, 0xff5f00, 0xff5f5f, 0xff5f87,
-    0xff5faf, 0xff5fd7, 0xff5fff, 0xff8700, 0xff875f, 0xff8787, 0xff87af,
-    0xff87d7, 0xff87ff, 0xffaf00, 0xffaf5f, 0xffaf87, 0xffafaf, 0xffafd7,
-    0xffafff, 0xffd700, 0xffd75f, 0xffd787, 0xffd7af, 0xffd7d7, 0xffd7ff,
-    0xffff00, 0xffff5f, 0xffff87, 0xffffaf, 0xffffd7, 0xffffff, 0x080808,
-    0x121212, 0x1c1c1c, 0x262626, 0x303030, 0x3a3a3a, 0x444444, 0x4e4e4e,
-    0x585858, 0x626262, 0x6c6c6c, 0x767676, 0x808080, 0x8a8a8a, 0x949494,
-    0x9e9e9e, 0xa8a8a8, 0xb2b2b2, 0xbcbcbc, 0xc6c6c6, 0xd0d0d0, 0xdadada,
-    0xe4e4e4, 0xeeeeee};
-
-#define CHARSET_DEFAULT 0
-#define CHARSET_DEC_SPECIAL 1
-
-void flanterm_context_reinit(struct flanterm_context *ctx) {
-  ctx->tab_size = 8;
-  ctx->autoflush = true;
-  ctx->cursor_enabled = true;
-  ctx->scroll_enabled = true;
-  ctx->control_sequence = false;
-  ctx->escape = false;
-  ctx->osc = false;
-  ctx->osc_escape = false;
-  ctx->rrr = false;
-  ctx->discard_next = false;
-  ctx->bold = false;
-  ctx->bg_bold = false;
-  ctx->reverse_video = false;
-  ctx->dec_private = false;
-  ctx->insert_mode = false;
-  ctx->unicode_remaining = 0;
-  ctx->g_select = 0;
-  ctx->charsets[0] = CHARSET_DEFAULT;
-  ctx->charsets[1] = CHARSET_DEC_SPECIAL;
-  ctx->current_charset = 0;
-  ctx->escape_offset = 0;
-  ctx->esc_values_i = 0;
-  ctx->saved_cursor_x = 0;
-  ctx->saved_cursor_y = 0;
-  ctx->current_primary = (size_t)-1;
-  ctx->current_bg = (size_t)-1;
-  ctx->scroll_top_margin = 0;
-  ctx->scroll_bottom_margin = ctx->rows;
-  ctx->oob_output = FLANTERM_OOB_OUTPUT_ONLCR;
-}
-
-static void flanterm_putchar(struct flanterm_context *ctx, uint8_t c);
-
-void flanterm_write(struct flanterm_context *ctx, const char *buf,
-                    size_t count) {
-  for (size_t i = 0; i < count; i++) {
-    flanterm_putchar(ctx, buf[i]);
-  }
-
-  if (ctx->autoflush) {
-    ctx->double_buffer_flush(ctx);
-  }
-}
-
-static void sgr(struct flanterm_context *ctx) {
-  size_t i = 0;
-
-  if (!ctx->esc_values_i)
-    goto def;
-
-  for (; i < ctx->esc_values_i; i++) {
-    size_t offset;
-
-    if (ctx->esc_values[i] == 0) {
-    def:
-      if (ctx->reverse_video) {
-        ctx->reverse_video = false;
-        ctx->swap_palette(ctx);
-      }
-      ctx->bold = false;
-      ctx->bg_bold = false;
-      ctx->current_primary = (size_t)-1;
-      ctx->current_bg = (size_t)-1;
-      ctx->set_text_bg_default(ctx);
-      ctx->set_text_fg_default(ctx);
-      continue;
-    }
-
-    else if (ctx->esc_values[i] == 1) {
-      ctx->bold = true;
-      if (ctx->current_primary != (size_t)-1) {
-        if (!ctx->reverse_video) {
-          ctx->set_text_fg_bright(ctx, ctx->current_primary);
-        } else {
-          ctx->set_text_bg_bright(ctx, ctx->current_primary);
-        }
-      } else {
-        if (!ctx->reverse_video) {
-          ctx->set_text_fg_default_bright(ctx);
-        } else {
-          ctx->set_text_bg_default_bright(ctx);
-        }
-      }
-      continue;
-    }
-
-    else if (ctx->esc_values[i] == 5) {
-      ctx->bg_bold = true;
-      if (ctx->current_bg != (size_t)-1) {
-        if (!ctx->reverse_video) {
-          ctx->set_text_bg_bright(ctx, ctx->current_bg);
-        } else {
-          ctx->set_text_fg_bright(ctx, ctx->current_bg);
-        }
-      } else {
-        if (!ctx->reverse_video) {
-          ctx->set_text_bg_default_bright(ctx);
-        } else {
-          ctx->set_text_fg_default_bright(ctx);
-        }
-      }
-      continue;
-    }
-
-    else if (ctx->esc_values[i] == 22) {
-      ctx->bold = false;
-      if (ctx->current_primary != (size_t)-1) {
-        if (!ctx->reverse_video) {
-          ctx->set_text_fg(ctx, ctx->current_primary);
-        } else {
-          ctx->set_text_bg(ctx, ctx->current_primary);
-        }
-      } else {
-        if (!ctx->reverse_video) {
-          ctx->set_text_fg_default(ctx);
-        } else {
-          ctx->set_text_bg_default(ctx);
-        }
-      }
-      continue;
-    }
-
-    else if (ctx->esc_values[i] == 25) {
-      ctx->bg_bold = false;
-      if (ctx->current_bg != (size_t)-1) {
-        if (!ctx->reverse_video) {
-          ctx->set_text_bg(ctx, ctx->current_bg);
-        } else {
-          ctx->set_text_fg(ctx, ctx->current_bg);
-        }
-      } else {
-        if (!ctx->reverse_video) {
-          ctx->set_text_bg_default(ctx);
-        } else {
-          ctx->set_text_fg_default(ctx);
-        }
-      }
-      continue;
-    }
-
-    else if (ctx->esc_values[i] >= 30 && ctx->esc_values[i] <= 37) {
-      offset = 30;
-      ctx->current_primary = ctx->esc_values[i] - offset;
-
-      if (ctx->reverse_video) {
-        goto set_bg;
-      }
-
-    set_fg:
-      if ((ctx->bold && !ctx->reverse_video) ||
-          (ctx->bg_bold && ctx->reverse_video)) {
-        ctx->set_text_fg_bright(ctx, ctx->esc_values[i] - offset);
-      } else {
-        ctx->set_text_fg(ctx, ctx->esc_values[i] - offset);
-      }
-      continue;
-    }
-
-    else if (ctx->esc_values[i] >= 40 && ctx->esc_values[i] <= 47) {
-      offset = 40;
-      ctx->current_bg = ctx->esc_values[i] - offset;
-
-      if (ctx->reverse_video) {
-        goto set_fg;
-      }
-
-    set_bg:
-      if ((ctx->bold && ctx->reverse_video) ||
-          (ctx->bg_bold && !ctx->reverse_video)) {
-        ctx->set_text_bg_bright(ctx, ctx->esc_values[i] - offset);
-      } else {
-        ctx->set_text_bg(ctx, ctx->esc_values[i] - offset);
-      }
-      continue;
-    }
-
-    else if (ctx->esc_values[i] >= 90 && ctx->esc_values[i] <= 97) {
-      offset = 90;
-      ctx->current_primary = ctx->esc_values[i] - offset;
-
-      if (ctx->reverse_video) {
-        goto set_bg_bright;
-      }
-
-    set_fg_bright:
-      ctx->set_text_fg_bright(ctx, ctx->esc_values[i] - offset);
-      continue;
-    }
-
-    else if (ctx->esc_values[i] >= 100 && ctx->esc_values[i] <= 107) {
-      offset = 100;
-      ctx->current_bg = ctx->esc_values[i] - offset;
-
-      if (ctx->reverse_video) {
-        goto set_fg_bright;
-      }
-
-    set_bg_bright:
-      ctx->set_text_bg_bright(ctx, ctx->esc_values[i] - offset);
-      continue;
-    }
-
-    else if (ctx->esc_values[i] == 39) {
-      ctx->current_primary = (size_t)-1;
-
-      if (ctx->reverse_video) {
-        ctx->swap_palette(ctx);
-      }
-
-      if (!ctx->bold) {
-        ctx->set_text_fg_default(ctx);
-      } else {
-        ctx->set_text_fg_default_bright(ctx);
-      }
-
-      if (ctx->reverse_video) {
-        ctx->swap_palette(ctx);
-      }
-
-      continue;
-    }
-
-    else if (ctx->esc_values[i] == 49) {
-      ctx->current_bg = (size_t)-1;
-
-      if (ctx->reverse_video) {
-        ctx->swap_palette(ctx);
-      }
-
-      if (!ctx->bg_bold) {
-        ctx->set_text_bg_default(ctx);
-      } else {
-        ctx->set_text_bg_default_bright(ctx);
-      }
-
-      if (ctx->reverse_video) {
-        ctx->swap_palette(ctx);
-      }
-
-      continue;
-    }
-
-    else if (ctx->esc_values[i] == 7) {
-      if (!ctx->reverse_video) {
-        ctx->reverse_video = true;
-        ctx->swap_palette(ctx);
-      }
-      continue;
-    }
-
-    else if (ctx->esc_values[i] == 27) {
-      if (ctx->reverse_video) {
-        ctx->reverse_video = false;
-        ctx->swap_palette(ctx);
-      }
-      continue;
-    }
-
-    // 256/RGB
-    else if (ctx->esc_values[i] == 38 || ctx->esc_values[i] == 48) {
-      bool fg = ctx->esc_values[i] == 38;
-
-      i++;
-      if (i >= ctx->esc_values_i) {
-        break;
-      }
-
-      switch (ctx->esc_values[i]) {
-      case 2: { // RGB
-        if (i + 3 >= ctx->esc_values_i) {
-          goto out;
-        }
-
-        uint32_t rgb_value = 0;
-
-        rgb_value |= ctx->esc_values[i + 1] << 16;
-        rgb_value |= ctx->esc_values[i + 2] << 8;
-        rgb_value |= ctx->esc_values[i + 3];
-
-        i += 3;
-
-        (fg ? ctx->set_text_fg_rgb : ctx->set_text_bg_rgb)(ctx, rgb_value);
-
-        break;
-      }
-      case 5: { // 256 colors
-        if (i + 1 >= ctx->esc_values_i) {
-          goto out;
-        }
-
-        uint32_t col = ctx->esc_values[i + 1];
-
-        i++;
-
-        if (col < 8) {
-          (fg ? ctx->set_text_fg : ctx->set_text_bg)(ctx, col);
-        } else if (col < 16) {
-          (fg ? ctx->set_text_fg_bright : ctx->set_text_bg_bright)(ctx,
-                                                                   col - 8);
-        } else if (col < 256) {
-          uint32_t rgb_value = col256[col - 16];
-          (fg ? ctx->set_text_fg_rgb : ctx->set_text_bg_rgb)(ctx, rgb_value);
-        }
-
-        break;
-      }
-      default:
-        continue;
-      }
-    }
-  }
-
-out:;
-}
-
-static void dec_private_parse(struct flanterm_context *ctx, uint8_t c) {
-  ctx->dec_private = false;
-
-  if (ctx->esc_values_i == 0) {
-    return;
-  }
-
-  bool set;
-
-  switch (c) {
-  case 'h':
-    set = true;
-    break;
-  case 'l':
-    set = false;
-    break;
-  default:
-    return;
-  }
-
-  switch (ctx->esc_values[0]) {
-  case 25: {
-    if (set) {
-      ctx->cursor_enabled = true;
-    } else {
-      ctx->cursor_enabled = false;
-    }
-    return;
-  }
-  }
-
-  if (ctx->callback != NULL) {
-    ctx->callback(ctx, FLANTERM_CB_DEC, ctx->esc_values_i,
-                  (uintptr_t)ctx->esc_values, c);
-  }
-}
-
-static void linux_private_parse(struct flanterm_context *ctx) {
-  if (ctx->esc_values_i == 0) {
-    return;
-  }
-
-  if (ctx->callback != NULL) {
-    ctx->callback(ctx, FLANTERM_CB_LINUX, ctx->esc_values_i,
-                  (uintptr_t)ctx->esc_values, 0);
-  }
-}
-
-static void mode_toggle(struct flanterm_context *ctx, uint8_t c) {
-  if (ctx->esc_values_i == 0) {
-    return;
-  }
-
-  bool set;
-
-  switch (c) {
-  case 'h':
-    set = true;
-    break;
-  case 'l':
-    set = false;
-    break;
-  default:
-    return;
-  }
-
-  switch (ctx->esc_values[0]) {
-  case 4:
-    ctx->insert_mode = set;
-    return;
-  }
-
-  if (ctx->callback != NULL) {
-    ctx->callback(ctx, FLANTERM_CB_MODE, ctx->esc_values_i,
-                  (uintptr_t)ctx->esc_values, c);
-  }
-}
-
-static void osc_parse(struct flanterm_context *ctx, uint8_t c) {
-  if (ctx->osc_escape && c == '\\') {
-    goto cleanup;
-  }
-
-  ctx->osc_escape = false;
-
-  switch (c) {
-  case 0x1b:
-    ctx->osc_escape = true;
-    return;
-  case '\a':
-  default:
-    break;
-  }
-
-cleanup:
-  ctx->osc_escape = false;
-  ctx->osc = false;
-  ctx->escape = false;
-}
-
-static void control_sequence_parse(struct flanterm_context *ctx, uint8_t c) {
-  if (ctx->escape_offset == 2) {
-    switch (c) {
-    case '[':
-      ctx->discard_next = true;
-      goto cleanup;
-    case '?':
-      ctx->dec_private = true;
-      return;
-    }
-  }
-
-  if (c >= '0' && c <= '9') {
-    if (ctx->esc_values_i == FLANTERM_MAX_ESC_VALUES) {
-      return;
-    }
-    ctx->rrr = true;
-    ctx->esc_values[ctx->esc_values_i] *= 10;
-    ctx->esc_values[ctx->esc_values_i] += c - '0';
-    return;
-  }
-
-  if (ctx->rrr == true) {
-    ctx->esc_values_i++;
-    ctx->rrr = false;
-    if (c == ';')
-      return;
-  } else if (c == ';') {
-    if (ctx->esc_values_i == FLANTERM_MAX_ESC_VALUES) {
-      return;
-    }
-    ctx->esc_values[ctx->esc_values_i] = 0;
-    ctx->esc_values_i++;
-    return;
-  }
-
-  size_t esc_default;
-  switch (c) {
-  case 'J':
-  case 'K':
-  case 'q':
-    esc_default = 0;
-    break;
-  default:
-    esc_default = 1;
-    break;
-  }
-
-  for (size_t i = ctx->esc_values_i; i < FLANTERM_MAX_ESC_VALUES; i++) {
-    ctx->esc_values[i] = esc_default;
-  }
-
-  if (ctx->dec_private == true) {
-    dec_private_parse(ctx, c);
-    goto cleanup;
-  }
-
-  bool r = ctx->scroll_enabled;
-  ctx->scroll_enabled = false;
-  size_t x, y;
-  ctx->get_cursor_pos(ctx, &x, &y);
-
-  switch (c) {
-  case 'F':
-    x = 0;
-    // FALLTHRU
-  case 'A': {
-    if (ctx->esc_values[0] > y)
-      ctx->esc_values[0] = y;
-    size_t orig_y = y;
-    size_t dest_y = y - ctx->esc_values[0];
-    bool will_be_in_scroll_region = false;
-    if ((ctx->scroll_top_margin >= dest_y &&
-         ctx->scroll_top_margin <= orig_y) ||
-        (ctx->scroll_bottom_margin >= dest_y &&
-         ctx->scroll_bottom_margin <= orig_y)) {
-      will_be_in_scroll_region = true;
-    }
-    if (will_be_in_scroll_region && dest_y < ctx->scroll_top_margin) {
-      dest_y = ctx->scroll_top_margin;
-    }
-    ctx->set_cursor_pos(ctx, x, dest_y);
-    break;
-  }
-  case 'E':
-    x = 0;
-    // FALLTHRU
-  case 'e':
-  case 'B': {
-    if (y + ctx->esc_values[0] > ctx->rows - 1)
-      ctx->esc_values[0] = (ctx->rows - 1) - y;
-    size_t orig_y = y;
-    size_t dest_y = y + ctx->esc_values[0];
-    bool will_be_in_scroll_region = false;
-    if ((ctx->scroll_top_margin >= orig_y &&
-         ctx->scroll_top_margin <= dest_y) ||
-        (ctx->scroll_bottom_margin >= orig_y &&
-         ctx->scroll_bottom_margin <= dest_y)) {
-      will_be_in_scroll_region = true;
-    }
-    if (will_be_in_scroll_region && dest_y >= ctx->scroll_bottom_margin) {
-      dest_y = ctx->scroll_bottom_margin - 1;
-    }
-    ctx->set_cursor_pos(ctx, x, dest_y);
-    break;
-  }
-  case 'a':
-  case 'C':
-    if (x + ctx->esc_values[0] > ctx->cols - 1)
-      ctx->esc_values[0] = (ctx->cols - 1) - x;
-    ctx->set_cursor_pos(ctx, x + ctx->esc_values[0], y);
-    break;
-  case 'D':
-    if (ctx->esc_values[0] > x)
-      ctx->esc_values[0] = x;
-    ctx->set_cursor_pos(ctx, x - ctx->esc_values[0], y);
-    break;
-  case 'c':
-    if (ctx->callback != NULL) {
-      ctx->callback(ctx, FLANTERM_CB_PRIVATE_ID, 0, 0, 0);
-    }
-    break;
-  case 'd':
-    ctx->esc_values[0] -= 1;
-    if (ctx->esc_values[0] >= ctx->rows)
-      ctx->esc_values[0] = ctx->rows - 1;
-    ctx->set_cursor_pos(ctx, x, ctx->esc_values[0]);
-    break;
-  case 'G':
-  case '`':
-    ctx->esc_values[0] -= 1;
-    if (ctx->esc_values[0] >= ctx->cols)
-      ctx->esc_values[0] = ctx->cols - 1;
-    ctx->set_cursor_pos(ctx, ctx->esc_values[0], y);
-    break;
-  case 'H':
-  case 'f':
-    if (ctx->esc_values[0] != 0) {
-      ctx->esc_values[0]--;
-    }
-    if (ctx->esc_values[1] != 0) {
-      ctx->esc_values[1]--;
-    }
-    if (ctx->esc_values[1] >= ctx->cols)
-      ctx->esc_values[1] = ctx->cols - 1;
-    if (ctx->esc_values[0] >= ctx->rows)
-      ctx->esc_values[0] = ctx->rows - 1;
-    ctx->set_cursor_pos(ctx, ctx->esc_values[1], ctx->esc_values[0]);
-    break;
-  case 'M': {
-    size_t count =
-        ctx->esc_values[0] > ctx->rows ? ctx->rows : ctx->esc_values[0];
-    for (size_t i = 0; i < count; i++) {
-      ctx->scroll(ctx);
-    }
-    break;
-  }
-  case 'L': {
-    size_t old_scroll_top_margin = ctx->scroll_top_margin;
-    ctx->scroll_top_margin = y;
-    size_t count =
-        ctx->esc_values[0] > ctx->rows ? ctx->rows : ctx->esc_values[0];
-    for (size_t i = 0; i < count; i++) {
-      ctx->revscroll(ctx);
-    }
-    ctx->scroll_top_margin = old_scroll_top_margin;
-    break;
-  }
-  case 'n':
-    switch (ctx->esc_values[0]) {
-    case 5:
-      if (ctx->callback != NULL) {
-        ctx->callback(ctx, FLANTERM_CB_STATUS_REPORT, 0, 0, 0);
-      }
-      break;
-    case 6:
-      if (ctx->callback != NULL) {
-        ctx->callback(ctx, FLANTERM_CB_POS_REPORT, x + 1, y + 1, 0);
-      }
-      break;
-    }
-    break;
-  case 'q':
-    if (ctx->callback != NULL) {
-      ctx->callback(ctx, FLANTERM_CB_KBD_LEDS, ctx->esc_values[0], 0, 0);
-    }
-    break;
-  case 'J':
-    switch (ctx->esc_values[0]) {
-    case 0: {
-      size_t rows_remaining = ctx->rows - (y + 1);
-      size_t cols_diff = ctx->cols - (x + 1);
-      size_t to_clear = rows_remaining * ctx->cols + cols_diff + 1;
-      for (size_t i = 0; i < to_clear; i++) {
-        ctx->raw_putchar(ctx, ' ');
-      }
-      ctx->set_cursor_pos(ctx, x, y);
-      break;
-    }
-    case 1: {
-      ctx->set_cursor_pos(ctx, 0, 0);
-      bool b = false;
-      for (size_t yc = 0; yc < ctx->rows; yc++) {
-        for (size_t xc = 0; xc < ctx->cols; xc++) {
-          ctx->raw_putchar(ctx, ' ');
-          if (xc == x && yc == y) {
-            ctx->set_cursor_pos(ctx, x, y);
-            b = true;
-            break;
-          }
-        }
-        if (b == true)
-          break;
-      }
-      break;
-    }
-    case 2:
-    case 3:
-      ctx->clear(ctx, false);
-      break;
-    }
-    break;
-  case '@':
-    for (size_t i = ctx->cols - 1;; i--) {
-      ctx->move_character(ctx, i + ctx->esc_values[0], y, i, y);
-      ctx->set_cursor_pos(ctx, i, y);
-      ctx->raw_putchar(ctx, ' ');
-      if (i == x) {
-        break;
-      }
-    }
-    ctx->set_cursor_pos(ctx, x, y);
-    break;
-  case 'P':
-    for (size_t i = x + ctx->esc_values[0]; i < ctx->cols; i++)
-      ctx->move_character(ctx, i - ctx->esc_values[0], y, i, y);
-    ctx->set_cursor_pos(ctx, ctx->cols - ctx->esc_values[0], y);
-    // FALLTHRU
-  case 'X': {
-    size_t count =
-        ctx->esc_values[0] > ctx->cols ? ctx->cols : ctx->esc_values[0];
-    for (size_t i = 0; i < count; i++)
-      ctx->raw_putchar(ctx, ' ');
-    ctx->set_cursor_pos(ctx, x, y);
-    break;
-  }
-  case 'm':
-    sgr(ctx);
-    break;
-  case 's':
-    ctx->get_cursor_pos(ctx, &ctx->saved_cursor_x, &ctx->saved_cursor_y);
-    break;
-  case 'u':
-    ctx->set_cursor_pos(ctx, ctx->saved_cursor_x, ctx->saved_cursor_y);
-    break;
-  case 'K':
-    switch (ctx->esc_values[0]) {
-    case 0: {
-      for (size_t i = x; i < ctx->cols; i++)
-        ctx->raw_putchar(ctx, ' ');
-      ctx->set_cursor_pos(ctx, x, y);
-      break;
-    }
-    case 1: {
-      ctx->set_cursor_pos(ctx, 0, y);
-      for (size_t i = 0; i < x; i++)
-        ctx->raw_putchar(ctx, ' ');
-      break;
-    }
-    case 2: {
-      ctx->set_cursor_pos(ctx, 0, y);
-      for (size_t i = 0; i < ctx->cols; i++)
-        ctx->raw_putchar(ctx, ' ');
-      ctx->set_cursor_pos(ctx, x, y);
-      break;
-    }
-    }
-    break;
-  case 'r':
-    if (ctx->esc_values[0] == 0) {
-      ctx->esc_values[0] = 1;
-    }
-    if (ctx->esc_values[1] == 0) {
-      ctx->esc_values[1] = 1;
-    }
-    ctx->scroll_top_margin = 0;
-    ctx->scroll_bottom_margin = ctx->rows;
-    if (ctx->esc_values_i > 0) {
-      ctx->scroll_top_margin = ctx->esc_values[0] - 1;
-    }
-    if (ctx->esc_values_i > 1) {
-      ctx->scroll_bottom_margin = ctx->esc_values[1];
-    }
-    if (ctx->scroll_top_margin >= ctx->rows ||
-        ctx->scroll_bottom_margin > ctx->rows ||
-        ctx->scroll_top_margin >= (ctx->scroll_bottom_margin - 1)) {
-      ctx->scroll_top_margin = 0;
-      ctx->scroll_bottom_margin = ctx->rows;
-    }
-    ctx->set_cursor_pos(ctx, 0, 0);
-    break;
-  case 'l':
-  case 'h':
-    mode_toggle(ctx, c);
-    break;
-  case ']':
-    linux_private_parse(ctx);
-    break;
-  }
-
-  ctx->scroll_enabled = r;
-
-cleanup:
-  ctx->control_sequence = false;
-  ctx->escape = false;
-}
-
-static void restore_state(struct flanterm_context *ctx) {
-  ctx->bold = ctx->saved_state_bold;
-  ctx->bg_bold = ctx->saved_state_bg_bold;
-  ctx->reverse_video = ctx->saved_state_reverse_video;
-  ctx->current_charset = ctx->saved_state_current_charset;
-  ctx->current_primary = ctx->saved_state_current_primary;
-  ctx->current_bg = ctx->saved_state_current_bg;
-
-  ctx->restore_state(ctx);
-}
-
-static void save_state(struct flanterm_context *ctx) {
-  ctx->save_state(ctx);
-
-  ctx->saved_state_bold = ctx->bold;
-  ctx->saved_state_bg_bold = ctx->bg_bold;
-  ctx->saved_state_reverse_video = ctx->reverse_video;
-  ctx->saved_state_current_charset = ctx->current_charset;
-  ctx->saved_state_current_primary = ctx->current_primary;
-  ctx->saved_state_current_bg = ctx->current_bg;
-}
-
-static void escape_parse(struct flanterm_context *ctx, uint8_t c) {
-  ctx->escape_offset++;
-
-  if (ctx->osc == true) {
-    osc_parse(ctx, c);
-    return;
-  }
-
-  if (ctx->control_sequence == true) {
-    control_sequence_parse(ctx, c);
-    return;
-  }
-
-  size_t x, y;
-  ctx->get_cursor_pos(ctx, &x, &y);
-
-  switch (c) {
-  case ']':
-    ctx->osc_escape = false;
-    ctx->osc = true;
-    return;
-  case '[':
-    for (size_t i = 0; i < FLANTERM_MAX_ESC_VALUES; i++)
-      ctx->esc_values[i] = 0;
-    ctx->esc_values_i = 0;
-    ctx->rrr = false;
-    ctx->control_sequence = true;
-    return;
-  case '7':
-    save_state(ctx);
-    break;
-  case '8':
-    restore_state(ctx);
-    break;
-  case 'c':
-    flanterm_context_reinit(ctx);
-    ctx->clear(ctx, true);
-    break;
-  case 'D':
-    if (y == ctx->scroll_bottom_margin - 1) {
-      ctx->scroll(ctx);
-      ctx->set_cursor_pos(ctx, x, y);
-    } else {
-      ctx->set_cursor_pos(ctx, x, y + 1);
-    }
-    break;
-  case 'E':
-    if (y == ctx->scroll_bottom_margin - 1) {
-      ctx->scroll(ctx);
-      ctx->set_cursor_pos(ctx, 0, y);
-    } else {
-      ctx->set_cursor_pos(ctx, 0, y + 1);
-    }
-    break;
-  case 'M':
-    // "Reverse linefeed"
-    if (y == ctx->scroll_top_margin) {
-      ctx->revscroll(ctx);
-      ctx->set_cursor_pos(ctx, 0, y);
-    } else {
-      ctx->set_cursor_pos(ctx, 0, y - 1);
-    }
-    break;
-  case 'Z':
-    if (ctx->callback != NULL) {
-      ctx->callback(ctx, FLANTERM_CB_PRIVATE_ID, 0, 0, 0);
-    }
-    break;
-  case '(':
-  case ')':
-    ctx->g_select = c - '\'';
-    break;
-  }
-
-  ctx->escape = false;
-}
-
-static bool dec_special_print(struct flanterm_context *ctx, uint8_t c) {
-#define FLANTERM_DEC_SPCL_PRN(C)                                               \
-  ctx->raw_putchar(ctx, (C));                                                  \
-  return true;
-  switch (c) {
-  case '`':
-    FLANTERM_DEC_SPCL_PRN(0x04)
-  case '0':
-    FLANTERM_DEC_SPCL_PRN(0xdb)
-  case '-':
-    FLANTERM_DEC_SPCL_PRN(0x18)
-  case ',':
-    FLANTERM_DEC_SPCL_PRN(0x1b)
-  case '.':
-    FLANTERM_DEC_SPCL_PRN(0x19)
-  case 'a':
-    FLANTERM_DEC_SPCL_PRN(0xb1)
-  case 'f':
-    FLANTERM_DEC_SPCL_PRN(0xf8)
-  case 'g':
-    FLANTERM_DEC_SPCL_PRN(0xf1)
-  case 'h':
-    FLANTERM_DEC_SPCL_PRN(0xb0)
-  case 'j':
-    FLANTERM_DEC_SPCL_PRN(0xd9)
-  case 'k':
-    FLANTERM_DEC_SPCL_PRN(0xbf)
-  case 'l':
-    FLANTERM_DEC_SPCL_PRN(0xda)
-  case 'm':
-    FLANTERM_DEC_SPCL_PRN(0xc0)
-  case 'n':
-    FLANTERM_DEC_SPCL_PRN(0xc5)
-  case 'q':
-    FLANTERM_DEC_SPCL_PRN(0xc4)
-  case 's':
-    FLANTERM_DEC_SPCL_PRN(0x5f)
-  case 't':
-    FLANTERM_DEC_SPCL_PRN(0xc3)
-  case 'u':
-    FLANTERM_DEC_SPCL_PRN(0xb4)
-  case 'v':
-    FLANTERM_DEC_SPCL_PRN(0xc1)
-  case 'w':
-    FLANTERM_DEC_SPCL_PRN(0xc2)
-  case 'x':
-    FLANTERM_DEC_SPCL_PRN(0xb3)
-  case 'y':
-    FLANTERM_DEC_SPCL_PRN(0xf3)
-  case 'z':
-    FLANTERM_DEC_SPCL_PRN(0xf2)
-  case '~':
-    FLANTERM_DEC_SPCL_PRN(0xfa)
-  case '_':
-    FLANTERM_DEC_SPCL_PRN(0xff)
-  case '+':
-    FLANTERM_DEC_SPCL_PRN(0x1a)
-  case '{':
-    FLANTERM_DEC_SPCL_PRN(0xe3)
-  case '}':
-    FLANTERM_DEC_SPCL_PRN(0x9c)
-  }
-#undef FLANTERM_DEC_SPCL_PRN
-
-  return false;
-}
-
-// Following wcwidth related code inherited from:
-// https://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
-
-struct interval {
-  uint32_t first;
-  uint32_t last;
-};
-
-/* auxiliary function for binary search in interval table */
-static int bisearch(uint32_t ucs, const struct interval *table, int max) {
-  int min = 0;
-  int mid;
-
-  if (ucs < table[0].first || ucs > table[max].last)
-    return 0;
-  while (max >= min) {
-    mid = (min + max) / 2;
-    if (ucs > table[mid].last)
-      min = mid + 1;
-    else if (ucs < table[mid].first)
-      max = mid - 1;
-    else
-      return 1;
-  }
-
-  return 0;
-}
-
-int mk_wcwidth(uint32_t ucs) {
-  /* sorted list of non-overlapping intervals of non-spacing characters */
-  /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */
-  static const struct interval combining[] = {
-      {0x0300, 0x036F},   {0x0483, 0x0486},   {0x0488, 0x0489},
-      {0x0591, 0x05BD},   {0x05BF, 0x05BF},   {0x05C1, 0x05C2},
-      {0x05C4, 0x05C5},   {0x05C7, 0x05C7},   {0x0600, 0x0603},
-      {0x0610, 0x0615},   {0x064B, 0x065E},   {0x0670, 0x0670},
-      {0x06D6, 0x06E4},   {0x06E7, 0x06E8},   {0x06EA, 0x06ED},
-      {0x070F, 0x070F},   {0x0711, 0x0711},   {0x0730, 0x074A},
-      {0x07A6, 0x07B0},   {0x07EB, 0x07F3},   {0x0901, 0x0902},
-      {0x093C, 0x093C},   {0x0941, 0x0948},   {0x094D, 0x094D},
-      {0x0951, 0x0954},   {0x0962, 0x0963},   {0x0981, 0x0981},
-      {0x09BC, 0x09BC},   {0x09C1, 0x09C4},   {0x09CD, 0x09CD},
-      {0x09E2, 0x09E3},   {0x0A01, 0x0A02},   {0x0A3C, 0x0A3C},
-      {0x0A41, 0x0A42},   {0x0A47, 0x0A48},   {0x0A4B, 0x0A4D},
-      {0x0A70, 0x0A71},   {0x0A81, 0x0A82},   {0x0ABC, 0x0ABC},
-      {0x0AC1, 0x0AC5},   {0x0AC7, 0x0AC8},   {0x0ACD, 0x0ACD},
-      {0x0AE2, 0x0AE3},   {0x0B01, 0x0B01},   {0x0B3C, 0x0B3C},
-      {0x0B3F, 0x0B3F},   {0x0B41, 0x0B43},   {0x0B4D, 0x0B4D},
-      {0x0B56, 0x0B56},   {0x0B82, 0x0B82},   {0x0BC0, 0x0BC0},
-      {0x0BCD, 0x0BCD},   {0x0C3E, 0x0C40},   {0x0C46, 0x0C48},
-      {0x0C4A, 0x0C4D},   {0x0C55, 0x0C56},   {0x0CBC, 0x0CBC},
-      {0x0CBF, 0x0CBF},   {0x0CC6, 0x0CC6},   {0x0CCC, 0x0CCD},
-      {0x0CE2, 0x0CE3},   {0x0D41, 0x0D43},   {0x0D4D, 0x0D4D},
-      {0x0DCA, 0x0DCA},   {0x0DD2, 0x0DD4},   {0x0DD6, 0x0DD6},
-      {0x0E31, 0x0E31},   {0x0E34, 0x0E3A},   {0x0E47, 0x0E4E},
-      {0x0EB1, 0x0EB1},   {0x0EB4, 0x0EB9},   {0x0EBB, 0x0EBC},
-      {0x0EC8, 0x0ECD},   {0x0F18, 0x0F19},   {0x0F35, 0x0F35},
-      {0x0F37, 0x0F37},   {0x0F39, 0x0F39},   {0x0F71, 0x0F7E},
-      {0x0F80, 0x0F84},   {0x0F86, 0x0F87},   {0x0F90, 0x0F97},
-      {0x0F99, 0x0FBC},   {0x0FC6, 0x0FC6},   {0x102D, 0x1030},
-      {0x1032, 0x1032},   {0x1036, 0x1037},   {0x1039, 0x1039},
-      {0x1058, 0x1059},   {0x1160, 0x11FF},   {0x135F, 0x135F},
-      {0x1712, 0x1714},   {0x1732, 0x1734},   {0x1752, 0x1753},
-      {0x1772, 0x1773},   {0x17B4, 0x17B5},   {0x17B7, 0x17BD},
-      {0x17C6, 0x17C6},   {0x17C9, 0x17D3},   {0x17DD, 0x17DD},
-      {0x180B, 0x180D},   {0x18A9, 0x18A9},   {0x1920, 0x1922},
-      {0x1927, 0x1928},   {0x1932, 0x1932},   {0x1939, 0x193B},
-      {0x1A17, 0x1A18},   {0x1B00, 0x1B03},   {0x1B34, 0x1B34},
-      {0x1B36, 0x1B3A},   {0x1B3C, 0x1B3C},   {0x1B42, 0x1B42},
-      {0x1B6B, 0x1B73},   {0x1DC0, 0x1DCA},   {0x1DFE, 0x1DFF},
-      {0x200B, 0x200F},   {0x202A, 0x202E},   {0x2060, 0x2063},
-      {0x206A, 0x206F},   {0x20D0, 0x20EF},   {0x302A, 0x302F},
-      {0x3099, 0x309A},   {0xA806, 0xA806},   {0xA80B, 0xA80B},
-      {0xA825, 0xA826},   {0xFB1E, 0xFB1E},   {0xFE00, 0xFE0F},
-      {0xFE20, 0xFE23},   {0xFEFF, 0xFEFF},   {0xFFF9, 0xFFFB},
-      {0x10A01, 0x10A03}, {0x10A05, 0x10A06}, {0x10A0C, 0x10A0F},
-      {0x10A38, 0x10A3A}, {0x10A3F, 0x10A3F}, {0x1D167, 0x1D169},
-      {0x1D173, 0x1D182}, {0x1D185, 0x1D18B}, {0x1D1AA, 0x1D1AD},
-      {0x1D242, 0x1D244}, {0xE0001, 0xE0001}, {0xE0020, 0xE007F},
-      {0xE0100, 0xE01EF}};
-
-  /* test for 8-bit control characters */
-  if (ucs == 0)
-    return 0;
-  if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0))
-    return 1;
-
-  /* binary search in table of non-spacing characters */
-  if (bisearch(ucs, combining, sizeof(combining) / sizeof(struct interval) - 1))
-    return 0;
-
-  /* if we arrive here, ucs is not a combining or C0/C1 control character */
-
-  return 1 +
-         (ucs >= 0x1100 &&
-          (ucs <= 0x115f || /* Hangul Jamo init. consonants */
-           ucs == 0x2329 || ucs == 0x232a ||
-           (ucs >= 0x2e80 && ucs <= 0xa4cf && ucs != 0x303f) || /* CJK ... Yi */
-           (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */
-           (ucs >= 0xf900 &&
-            ucs <= 0xfaff) || /* CJK Compatibility Ideographs */
-           (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */
-           (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */
-           (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */
-           (ucs >= 0xffe0 && ucs <= 0xffe6) ||
-           (ucs >= 0x20000 && ucs <= 0x2fffd) ||
-           (ucs >= 0x30000 && ucs <= 0x3fffd)));
-}
-
-// End of https://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c inherited code
-
-static int unicode_to_cp437(uint64_t code_point) {
-  switch (code_point) {
-  case 0x263a:
-    return 1;
-  case 0x263b:
-    return 2;
-  case 0x2665:
-    return 3;
-  case 0x2666:
-    return 4;
-  case 0x2663:
-    return 5;
-  case 0x2660:
-    return 6;
-  case 0x2022:
-    return 7;
-  case 0x25d8:
-    return 8;
-  case 0x25cb:
-    return 9;
-  case 0x25d9:
-    return 10;
-  case 0x2642:
-    return 11;
-  case 0x2640:
-    return 12;
-  case 0x266a:
-    return 13;
-  case 0x266b:
-    return 14;
-  case 0x263c:
-    return 15;
-  case 0x25ba:
-    return 16;
-  case 0x25c4:
-    return 17;
-  case 0x2195:
-    return 18;
-  case 0x203c:
-    return 19;
-  case 0x00b6:
-    return 20;
-  case 0x00a7:
-    return 21;
-  case 0x25ac:
-    return 22;
-  case 0x21a8:
-    return 23;
-  case 0x2191:
-    return 24;
-  case 0x2193:
-    return 25;
-  case 0x2192:
-    return 26;
-  case 0x2190:
-    return 27;
-  case 0x221f:
-    return 28;
-  case 0x2194:
-    return 29;
-  case 0x25b2:
-    return 30;
-  case 0x25bc:
-    return 31;
-
-  case 0x2302:
-    return 127;
-  case 0x00c7:
-    return 128;
-  case 0x00fc:
-    return 129;
-  case 0x00e9:
-    return 130;
-  case 0x00e2:
-    return 131;
-  case 0x00e4:
-    return 132;
-  case 0x00e0:
-    return 133;
-  case 0x00e5:
-    return 134;
-  case 0x00e7:
-    return 135;
-  case 0x00ea:
-    return 136;
-  case 0x00eb:
-    return 137;
-  case 0x00e8:
-    return 138;
-  case 0x00ef:
-    return 139;
-  case 0x00ee:
-    return 140;
-  case 0x00ec:
-    return 141;
-  case 0x00c4:
-    return 142;
-  case 0x00c5:
-    return 143;
-  case 0x00c9:
-    return 144;
-  case 0x00e6:
-    return 145;
-  case 0x00c6:
-    return 146;
-  case 0x00f4:
-    return 147;
-  case 0x00f6:
-    return 148;
-  case 0x00f2:
-    return 149;
-  case 0x00fb:
-    return 150;
-  case 0x00f9:
-    return 151;
-  case 0x00ff:
-    return 152;
-  case 0x00d6:
-    return 153;
-  case 0x00dc:
-    return 154;
-  case 0x00a2:
-    return 155;
-  case 0x00a3:
-    return 156;
-  case 0x00a5:
-    return 157;
-  case 0x20a7:
-    return 158;
-  case 0x0192:
-    return 159;
-  case 0x00e1:
-    return 160;
-  case 0x00ed:
-    return 161;
-  case 0x00f3:
-    return 162;
-  case 0x00fa:
-    return 163;
-  case 0x00f1:
-    return 164;
-  case 0x00d1:
-    return 165;
-  case 0x00aa:
-    return 166;
-  case 0x00ba:
-    return 167;
-  case 0x00bf:
-    return 168;
-  case 0x2310:
-    return 169;
-  case 0x00ac:
-    return 170;
-  case 0x00bd:
-    return 171;
-  case 0x00bc:
-    return 172;
-  case 0x00a1:
-    return 173;
-  case 0x00ab:
-    return 174;
-  case 0x00bb:
-    return 175;
-  case 0x2591:
-    return 176;
-  case 0x2592:
-    return 177;
-  case 0x2593:
-    return 178;
-  case 0x2502:
-    return 179;
-  case 0x2524:
-    return 180;
-  case 0x2561:
-    return 181;
-  case 0x2562:
-    return 182;
-  case 0x2556:
-    return 183;
-  case 0x2555:
-    return 184;
-  case 0x2563:
-    return 185;
-  case 0x2551:
-    return 186;
-  case 0x2557:
-    return 187;
-  case 0x255d:
-    return 188;
-  case 0x255c:
-    return 189;
-  case 0x255b:
-    return 190;
-  case 0x2510:
-    return 191;
-  case 0x2514:
-    return 192;
-  case 0x2534:
-    return 193;
-  case 0x252c:
-    return 194;
-  case 0x251c:
-    return 195;
-  case 0x2500:
-    return 196;
-  case 0x253c:
-    return 197;
-  case 0x255e:
-    return 198;
-  case 0x255f:
-    return 199;
-  case 0x255a:
-    return 200;
-  case 0x2554:
-    return 201;
-  case 0x2569:
-    return 202;
-  case 0x2566:
-    return 203;
-  case 0x2560:
-    return 204;
-  case 0x2550:
-    return 205;
-  case 0x256c:
-    return 206;
-  case 0x2567:
-    return 207;
-  case 0x2568:
-    return 208;
-  case 0x2564:
-    return 209;
-  case 0x2565:
-    return 210;
-  case 0x2559:
-    return 211;
-  case 0x2558:
-    return 212;
-  case 0x2552:
-    return 213;
-  case 0x2553:
-    return 214;
-  case 0x256b:
-    return 215;
-  case 0x256a:
-    return 216;
-  case 0x2518:
-    return 217;
-  case 0x250c:
-    return 218;
-  case 0x2588:
-    return 219;
-  case 0x2584:
-    return 220;
-  case 0x258c:
-    return 221;
-  case 0x2590:
-    return 222;
-  case 0x2580:
-    return 223;
-  case 0x03b1:
-    return 224;
-  case 0x00df:
-    return 225;
-  case 0x0393:
-    return 226;
-  case 0x03c0:
-    return 227;
-  case 0x03a3:
-    return 228;
-  case 0x03c3:
-    return 229;
-  case 0x00b5:
-    return 230;
-  case 0x03c4:
-    return 231;
-  case 0x03a6:
-    return 232;
-  case 0x0398:
-    return 233;
-  case 0x03a9:
-    return 234;
-  case 0x03b4:
-    return 235;
-  case 0x221e:
-    return 236;
-  case 0x03c6:
-    return 237;
-  case 0x03b5:
-    return 238;
-  case 0x2229:
-    return 239;
-  case 0x2261:
-    return 240;
-  case 0x00b1:
-    return 241;
-  case 0x2265:
-    return 242;
-  case 0x2264:
-    return 243;
-  case 0x2320:
-    return 244;
-  case 0x2321:
-    return 245;
-  case 0x00f7:
-    return 246;
-  case 0x2248:
-    return 247;
-  case 0x00b0:
-    return 248;
-  case 0x2219:
-    return 249;
-  case 0x00b7:
-    return 250;
-  case 0x221a:
-    return 251;
-  case 0x207f:
-    return 252;
-  case 0x00b2:
-    return 253;
-  case 0x25a0:
-    return 254;
-  }
-
-  return -1;
-}
-
-static void flanterm_putchar(struct flanterm_context *ctx, uint8_t c) {
-  if (ctx->discard_next || (c == 0x18 || c == 0x1a)) {
-    ctx->discard_next = false;
-    ctx->escape = false;
-    ctx->control_sequence = false;
-    ctx->unicode_remaining = 0;
-    ctx->osc = false;
-    ctx->osc_escape = false;
-    ctx->g_select = 0;
-    return;
-  }
-
-  if (ctx->unicode_remaining != 0) {
-    if ((c & 0xc0) != 0x80) {
-      ctx->unicode_remaining = 0;
-      goto unicode_error;
-    }
-
-    ctx->unicode_remaining--;
-    ctx->code_point |= (uint64_t)(c & 0x3f) << (6 * ctx->unicode_remaining);
-    if (ctx->unicode_remaining != 0) {
-      return;
-    }
-
-    int cc = unicode_to_cp437(ctx->code_point);
-
-    if (cc == -1) {
-      size_t replacement_width = (size_t)mk_wcwidth(ctx->code_point);
-      if (replacement_width > 0) {
-        ctx->raw_putchar(ctx, 0xfe);
-      }
-      for (size_t i = 1; i < replacement_width; i++) {
-        ctx->raw_putchar(ctx, ' ');
-      }
-    } else {
-      ctx->raw_putchar(ctx, cc);
-    }
-    return;
-  }
-
-unicode_error:
-  if (c >= 0xc0 && c <= 0xf7) {
-    if (c >= 0xc0 && c <= 0xdf) {
-      ctx->unicode_remaining = 1;
-      ctx->code_point = (uint64_t)(c & 0x1f) << 6;
-    } else if (c >= 0xe0 && c <= 0xef) {
-      ctx->unicode_remaining = 2;
-      ctx->code_point = (uint64_t)(c & 0x0f) << (6 * 2);
-    } else if (c >= 0xf0 && c <= 0xf7) {
-      ctx->unicode_remaining = 3;
-      ctx->code_point = (uint64_t)(c & 0x07) << (6 * 3);
-    }
-    return;
-  }
-
-  if (ctx->escape == true) {
-    escape_parse(ctx, c);
-    return;
-  }
-
-  if (ctx->g_select) {
-    ctx->g_select--;
-    switch (c) {
-    case 'B':
-      ctx->charsets[ctx->g_select] = CHARSET_DEFAULT;
-      break;
-    case '0':
-      ctx->charsets[ctx->g_select] = CHARSET_DEC_SPECIAL;
-      break;
-    }
-    ctx->g_select = 0;
-    return;
-  }
-
-  size_t x, y;
-  ctx->get_cursor_pos(ctx, &x, &y);
-
-  switch (c) {
-  case 0x00:
-  case 0x7f:
-    return;
-  case 0x1b:
-    ctx->escape_offset = 0;
-    ctx->escape = true;
-    return;
-  case '\t':
-    if ((x / ctx->tab_size + 1) >= ctx->cols) {
-      ctx->set_cursor_pos(ctx, ctx->cols - 1, y);
-      return;
-    }
-    ctx->set_cursor_pos(ctx, (x / ctx->tab_size + 1) * ctx->tab_size, y);
-    return;
-  case 0x0b:
-  case 0x0c:
-  case '\n':
-    if (y == ctx->scroll_bottom_margin - 1) {
-      ctx->scroll(ctx);
-      ctx->set_cursor_pos(
-          ctx, (ctx->oob_output & FLANTERM_OOB_OUTPUT_ONLCR) ? 0 : x, y);
-    } else {
-      ctx->set_cursor_pos(
-          ctx, (ctx->oob_output & FLANTERM_OOB_OUTPUT_ONLCR) ? 0 : x, y + 1);
-    }
-    return;
-  case '\b':
-    ctx->set_cursor_pos(ctx, x - 1, y);
-    return;
-  case '\r':
-    ctx->set_cursor_pos(ctx, 0, y);
-    return;
-  case '\a':
-    // The bell is handled by the kernel
-    if (ctx->callback != NULL) {
-      ctx->callback(ctx, FLANTERM_CB_BELL, 0, 0, 0);
-    }
-    return;
-  case 14:
-    // Move to G1 set
-    ctx->current_charset = 1;
-    return;
-  case 15:
-    // Move to G0 set
-    ctx->current_charset = 0;
-    return;
-  }
-
-  if (ctx->insert_mode == true) {
-    for (size_t i = ctx->cols - 1;; i--) {
-      ctx->move_character(ctx, i + 1, y, i, y);
-      if (i == x) {
-        break;
-      }
-    }
-  }
-
-  // Translate character set
-  switch (ctx->charsets[ctx->current_charset]) {
-  case CHARSET_DEFAULT:
-    break;
-  case CHARSET_DEC_SPECIAL:
-    if (dec_special_print(ctx, c)) {
-      return;
-    }
-    break;
-  }
-
-  if (c >= 0x20 && c <= 0x7e) {
-    ctx->raw_putchar(ctx, c);
-  } else {
-    ctx->raw_putchar(ctx, 0xfe);
-  }
-}
-
-void flanterm_flush(struct flanterm_context *ctx) {
-  ctx->double_buffer_flush(ctx);
-}
-
-void flanterm_full_refresh(struct flanterm_context *ctx) {
-  ctx->full_refresh(ctx);
-}
-
-void flanterm_deinit(struct flanterm_context *ctx,
-                     void (*_free)(void *, size_t)) {
-  ctx->deinit(ctx, _free);
-}
-
-void flanterm_get_dimensions(struct flanterm_context *ctx, size_t *cols,
-                             size_t *rows) {
-  *cols = ctx->cols;
-  *rows = ctx->rows;
-}
-
-void flanterm_set_autoflush(struct flanterm_context *ctx, bool state) {
-  ctx->autoflush = state;
-}
-
-void flanterm_set_callback(struct flanterm_context *ctx,
-                           void (*callback)(struct flanterm_context *, uint64_t,
-                                            uint64_t, uint64_t, uint64_t)) {
-  ctx->callback = callback;
-}
-
-uint64_t flanterm_get_oob_output(struct flanterm_context *ctx) {
-  return ctx->oob_output;
-}
-
-void flanterm_set_oob_output(struct flanterm_context *ctx,
-                             uint64_t oob_output) {
-  ctx->oob_output = oob_output;
-}
diff --git a/kernel/src/sys/gfx/flanterm/flanterm.h b/kernel/src/sys/gfx/flanterm/flanterm.h
deleted file mode 100644
index a4d5b78..0000000
--- a/kernel/src/sys/gfx/flanterm/flanterm.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Copyright (C) 2022-2025 mintsuki and contributors.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef FLANTERM_H
-#define FLANTERM_H 1
-
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define FLANTERM_CB_DEC 10
-#define FLANTERM_CB_BELL 20
-#define FLANTERM_CB_PRIVATE_ID 30
-#define FLANTERM_CB_STATUS_REPORT 40
-#define FLANTERM_CB_POS_REPORT 50
-#define FLANTERM_CB_KBD_LEDS 60
-#define FLANTERM_CB_MODE 70
-#define FLANTERM_CB_LINUX 80
-
-#define FLANTERM_OOB_OUTPUT_OCRNL (1 << 0)
-#define FLANTERM_OOB_OUTPUT_OFDEL (1 << 1)
-#define FLANTERM_OOB_OUTPUT_OFILL (1 << 2)
-#define FLANTERM_OOB_OUTPUT_OLCUC (1 << 3)
-#define FLANTERM_OOB_OUTPUT_ONLCR (1 << 4)
-#define FLANTERM_OOB_OUTPUT_ONLRET (1 << 5)
-#define FLANTERM_OOB_OUTPUT_ONOCR (1 << 6)
-#define FLANTERM_OOB_OUTPUT_OPOST (1 << 7)
-
-#ifdef FLANTERM_IN_FLANTERM
-
-#include "flanterm_private.h"
-
-#else
-
-struct flanterm_context;
-
-#endif
-
-void flanterm_write(struct flanterm_context *ctx, const char *buf,
-                    size_t count);
-void flanterm_flush(struct flanterm_context *ctx);
-void flanterm_full_refresh(struct flanterm_context *ctx);
-void flanterm_deinit(struct flanterm_context *ctx,
-                     void (*_free)(void *ptr, size_t size));
-
-void flanterm_get_dimensions(struct flanterm_context *ctx, size_t *cols,
-                             size_t *rows);
-void flanterm_set_autoflush(struct flanterm_context *ctx, bool state);
-void flanterm_set_callback(struct flanterm_context *ctx,
-                           void (*callback)(struct flanterm_context *, uint64_t,
-                                            uint64_t, uint64_t, uint64_t));
-uint64_t flanterm_get_oob_output(struct flanterm_context *ctx);
-void flanterm_set_oob_output(struct flanterm_context *ctx, uint64_t oob_output);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/kernel/src/sys/gfx/flanterm/flanterm_private.h b/kernel/src/sys/gfx/flanterm/flanterm_private.h
deleted file mode 100644
index 9b049af..0000000
--- a/kernel/src/sys/gfx/flanterm/flanterm_private.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* Copyright (C) 2022-2025 mintsuki and contributors.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef FLANTERM_PRIVATE_H
-#define FLANTERM_PRIVATE_H 1
-
-#ifndef FLANTERM_IN_FLANTERM
-#error                                                                         \
-    "Do not use flanterm_private.h. Use interfaces defined in flanterm.h only."
-#endif
-
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define FLANTERM_MAX_ESC_VALUES 16
-
-struct flanterm_context {
-  /* internal use */
-
-  size_t tab_size;
-  bool autoflush;
-  bool cursor_enabled;
-  bool scroll_enabled;
-  bool control_sequence;
-  bool escape;
-  bool osc;
-  bool osc_escape;
-  bool rrr;
-  bool discard_next;
-  bool bold;
-  bool bg_bold;
-  bool reverse_video;
-  bool dec_private;
-  bool insert_mode;
-  uint64_t code_point;
-  size_t unicode_remaining;
-  uint8_t g_select;
-  uint8_t charsets[2];
-  size_t current_charset;
-  size_t escape_offset;
-  size_t esc_values_i;
-  size_t saved_cursor_x;
-  size_t saved_cursor_y;
-  size_t current_primary;
-  size_t current_bg;
-  size_t scroll_top_margin;
-  size_t scroll_bottom_margin;
-  uint32_t esc_values[FLANTERM_MAX_ESC_VALUES];
-  uint64_t oob_output;
-  bool saved_state_bold;
-  bool saved_state_bg_bold;
-  bool saved_state_reverse_video;
-  size_t saved_state_current_charset;
-  size_t saved_state_current_primary;
-  size_t saved_state_current_bg;
-
-  /* to be set by backend */
-
-  size_t rows, cols;
-
-  void (*raw_putchar)(struct flanterm_context *, uint8_t c);
-  void (*clear)(struct flanterm_context *, bool move);
-  void (*set_cursor_pos)(struct flanterm_context *, size_t x, size_t y);
-  void (*get_cursor_pos)(struct flanterm_context *, size_t *x, size_t *y);
-  void (*set_text_fg)(struct flanterm_context *, size_t fg);
-  void (*set_text_bg)(struct flanterm_context *, size_t bg);
-  void (*set_text_fg_bright)(struct flanterm_context *, size_t fg);
-  void (*set_text_bg_bright)(struct flanterm_context *, size_t bg);
-  void (*set_text_fg_rgb)(struct flanterm_context *, uint32_t fg);
-  void (*set_text_bg_rgb)(struct flanterm_context *, uint32_t bg);
-  void (*set_text_fg_default)(struct flanterm_context *);
-  void (*set_text_bg_default)(struct flanterm_context *);
-  void (*set_text_fg_default_bright)(struct flanterm_context *);
-  void (*set_text_bg_default_bright)(struct flanterm_context *);
-  void (*move_character)(struct flanterm_context *, size_t new_x, size_t new_y,
-                         size_t old_x, size_t old_y);
-  void (*scroll)(struct flanterm_context *);
-  void (*revscroll)(struct flanterm_context *);
-  void (*swap_palette)(struct flanterm_context *);
-  void (*save_state)(struct flanterm_context *);
-  void (*restore_state)(struct flanterm_context *);
-  void (*double_buffer_flush)(struct flanterm_context *);
-  void (*full_refresh)(struct flanterm_context *);
-  void (*deinit)(struct flanterm_context *, void (*)(void *, size_t));
-
-  /* to be set by client */
-
-  void (*callback)(struct flanterm_context *, uint64_t, uint64_t, uint64_t,
-                   uint64_t);
-};
-
-void flanterm_context_reinit(struct flanterm_context *ctx);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/kernel/src/sys/log.c b/kernel/src/sys/log.c
deleted file mode 100644
index 548ff29..0000000
--- a/kernel/src/sys/log.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include "sys/arch/x86_64/io.h"
-#include "sys/gfx/flanterm/flanterm.h"
-#include <lib/spinlock.h>
-#include <stdarg.h>
-#include <sys/printf.h>
-
-extern struct flanterm_context *ft_ctx;
-
-static spinlock_t log_lock = {0};
-
-void log(char *format, ...) {
-  // spinlock_acquire(&log_lock);
-
-  // TODO: replace this call with a call to printf() when the RTC is
-  // implemented.
-  char *date = "1970-01-01 00:00:00 | ";
-  int i2 = 0;
-  for (i2; date[i2] != 0; i2++)
-    ;
-  ;
-  if (ft_ctx)
-    flanterm_write(ft_ctx, date, i2);
-
-  char buf[2048];
-  va_list l;
-  va_start(l, format);
-  npf_vsnprintf(buf, 2048, format, l);
-  va_end(l);
-
-  int i = 0;
-  for (i; buf[i] != 0; i++)
-    ;
-  ;
-  if (ft_ctx)
-    flanterm_write(ft_ctx, buf, i);
-
-  for (int i = 0;; i++) {
-    if (date[i] == '\0')
-      break;
-
-    outb(0xE9, date[i]);
-  }
-
-  for (int i = 0;; i++) {
-    if (buf[i] == '\0')
-      break;
-
-    outb(0xE9, buf[i]);
-  }
-
-  // spinlock_release(&log_lock);
-}
\ No newline at end of file
diff --git a/kernel/src/sys/log.h b/kernel/src/sys/log.h
deleted file mode 100755
index 1d9545f..0000000
--- a/kernel/src/sys/log.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-void log(char *format, ...);
\ No newline at end of file
diff --git a/kernel/src/sys/printf.c b/kernel/src/sys/printf.c
deleted file mode 100644
index 9097ac6..0000000
--- a/kernel/src/sys/printf.c
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2024 Sipaa Projects
-// This code is part of the Soaplin kernel and is licensed under the terms of
-// the MIT License.
-#include "sys/gfx/flanterm/flanterm.h"
-#include <stdarg.h>
-
-#define NANOPRINTF_USE_FIELD_WIDTH_FORMAT_SPECIFIERS 1
-#define NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS 1
-#define NANOPRINTF_USE_LARGE_FORMAT_SPECIFIERS 1
-#define NANOPRINTF_USE_FLOAT_FORMAT_SPECIFIERS 0
-#define NANOPRINTF_USE_BINARY_FORMAT_SPECIFIERS 1
-#define NANOPRINTF_USE_WRITEBACK_FORMAT_SPECIFIERS 0
-
-// Compile nanoprintf in this translation unit.
-#define NANOPRINTF_IMPLEMENTATION
-#include <sys/printf.h>
-
-extern struct flanterm_context *ft_ctx;
-
-void printf(char *format, ...) {
-  char buf[2048];
-  va_list lst;
-  va_start(lst, format);
-  npf_vsnprintf(buf, 2048, format, lst);
-  va_end(lst);
-
-  // rt_print(buf);
-  int i = 0;
-  for (i; buf[i] != 0; i++)
-    ;
-  ;
-
-  if (ft_ctx)
-    flanterm_write(ft_ctx, buf, i);
-}
\ No newline at end of file
diff --git a/kernel/src/sys/printf.h b/kernel/src/sys/printf.h
deleted file mode 100755
index 759e840..0000000
--- a/kernel/src/sys/printf.h
+++ /dev/null
@@ -1,1320 +0,0 @@
-/* nanoprintf v0.5.3: a tiny embeddable printf replacement written in C.
-   https://github.com/charlesnicholson/nanoprintf
-   charles.nicholson+nanoprintf@gmail.com
-   dual-licensed under 0bsd and unlicense, take your pick. see eof for details.
- */
-
-#ifndef NANOPRINTF_H_INCLUDED
-#define NANOPRINTF_H_INCLUDED
-
-#include <stdarg.h>
-#include <stddef.h>
-
-// Define this to fully sandbox nanoprintf inside of a translation unit.
-#ifdef NANOPRINTF_VISIBILITY_STATIC
-#define NPF_VISIBILITY static
-#else
-#define NPF_VISIBILITY extern
-#endif
-
-#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
-#define NPF_PRINTF_ATTR(FORMAT_INDEX, VARGS_INDEX)                             \
-  __attribute__((format(printf, FORMAT_INDEX, VARGS_INDEX)))
-#else
-#define NPF_PRINTF_ATTR(FORMAT_INDEX, VARGS_INDEX)
-#endif
-
-// Public API
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// The npf_ functions all return the number of bytes required to express the
-// fully-formatted string, not including the null terminator character.
-// The npf_ functions do not return negative values, since the lack of 'l'
-// length modifier support makes encoding errors impossible.
-
-NPF_VISIBILITY int npf_snprintf(char *buffer, size_t bufsz, const char *format,
-                                ...) NPF_PRINTF_ATTR(3, 4);
-
-NPF_VISIBILITY int npf_vsnprintf(char *buffer, size_t bufsz, char const *format,
-                                 va_list vlist) NPF_PRINTF_ATTR(3, 0);
-
-typedef void (*npf_putc)(int c, void *ctx);
-NPF_VISIBILITY int npf_pprintf(npf_putc pc, void *pc_ctx, char const *format,
-                               ...) NPF_PRINTF_ATTR(3, 4);
-
-NPF_VISIBILITY int npf_vpprintf(npf_putc pc, void *pc_ctx, char const *format,
-                                va_list vlist) NPF_PRINTF_ATTR(3, 0);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // NANOPRINTF_H_INCLUDED
-
-/* The implementation of nanoprintf begins here, to be compiled only if
-   NANOPRINTF_IMPLEMENTATION is defined. In a multi-file library what follows
-   would be nanoprintf.c. */
-
-#ifdef NANOPRINTF_IMPLEMENTATION
-
-#ifndef NANOPRINTF_IMPLEMENTATION_INCLUDED
-#define NANOPRINTF_IMPLEMENTATION_INCLUDED
-
-#include <limits.h>
-#include <stdint.h>
-
-// The conversion buffer must fit at least UINT64_MAX in octal format with the
-// leading '0'.
-#ifndef NANOPRINTF_CONVERSION_BUFFER_SIZE
-#define NANOPRINTF_CONVERSION_BUFFER_SIZE 23
-#endif
-#if NANOPRINTF_CONVERSION_BUFFER_SIZE < 23
-#error The size of the conversion buffer must be at least 23 bytes.
-#endif
-
-// Pick reasonable defaults if nothing's been configured.
-#if !defined(NANOPRINTF_USE_FIELD_WIDTH_FORMAT_SPECIFIERS) &&                  \
-    !defined(NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS) &&                    \
-    !defined(NANOPRINTF_USE_FLOAT_FORMAT_SPECIFIERS) &&                        \
-    !defined(NANOPRINTF_USE_LARGE_FORMAT_SPECIFIERS) &&                        \
-    !defined(NANOPRINTF_USE_BINARY_FORMAT_SPECIFIERS) &&                       \
-    !defined(NANOPRINTF_USE_WRITEBACK_FORMAT_SPECIFIERS)
-#define NANOPRINTF_USE_FIELD_WIDTH_FORMAT_SPECIFIERS 1
-#define NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS 1
-#define NANOPRINTF_USE_FLOAT_FORMAT_SPECIFIERS 1
-#define NANOPRINTF_USE_LARGE_FORMAT_SPECIFIERS 0
-#define NANOPRINTF_USE_BINARY_FORMAT_SPECIFIERS 0
-#define NANOPRINTF_USE_WRITEBACK_FORMAT_SPECIFIERS 0
-#endif
-
-// If anything's been configured, everything must be configured.
-#ifndef NANOPRINTF_USE_FIELD_WIDTH_FORMAT_SPECIFIERS
-#error NANOPRINTF_USE_FIELD_WIDTH_FORMAT_SPECIFIERS must be #defined to 0 or 1
-#endif
-#ifndef NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS
-#error NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS must be #defined to 0 or 1
-#endif
-#ifndef NANOPRINTF_USE_FLOAT_FORMAT_SPECIFIERS
-#error NANOPRINTF_USE_FLOAT_FORMAT_SPECIFIERS must be #defined to 0 or 1
-#endif
-#ifndef NANOPRINTF_USE_LARGE_FORMAT_SPECIFIERS
-#error NANOPRINTF_USE_LARGE_FORMAT_SPECIFIERS must be #defined to 0 or 1
-#endif
-#ifndef NANOPRINTF_USE_BINARY_FORMAT_SPECIFIERS
-#error NANOPRINTF_USE_BINARY_FORMAT_SPECIFIERS must be #defined to 0 or 1
-#endif
-#ifndef NANOPRINTF_USE_WRITEBACK_FORMAT_SPECIFIERS
-#error NANOPRINTF_USE_WRITEBACK_FORMAT_SPECIFIERS must be #defined to 0 or 1
-#endif
-
-// Ensure flags are compatible.
-#if (NANOPRINTF_USE_FLOAT_FORMAT_SPECIFIERS == 1) &&                           \
-    (NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS == 0)
-#error Precision format specifiers must be enabled if float support is enabled.
-#endif
-
-// intmax_t / uintmax_t require stdint from c99 / c++11
-#if NANOPRINTF_USE_LARGE_FORMAT_SPECIFIERS == 1
-#ifndef _MSC_VER
-#ifdef __cplusplus
-#if __cplusplus < 201103L
-#error large format specifier support requires C++11 or later.
-#endif
-#else
-#if __STDC_VERSION__ < 199409L
-#error nanoprintf requires C99 or later.
-#endif
-#endif
-#endif
-#endif
-
-// Figure out if we can disable warnings with pragmas.
-#ifdef __clang__
-#define NANOPRINTF_CLANG 1
-#define NANOPRINTF_GCC_PAST_4_6 0
-#else
-#define NANOPRINTF_CLANG 0
-#if defined(__GNUC__) &&                                                       \
-    ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 6)))
-#define NANOPRINTF_GCC_PAST_4_6 1
-#else
-#define NANOPRINTF_GCC_PAST_4_6 0
-#endif
-#endif
-
-#if NANOPRINTF_CLANG || NANOPRINTF_GCC_PAST_4_6
-#define NANOPRINTF_HAVE_GCC_WARNING_PRAGMAS 1
-#else
-#define NANOPRINTF_HAVE_GCC_WARNING_PRAGMAS 0
-#endif
-
-#if NANOPRINTF_HAVE_GCC_WARNING_PRAGMAS
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-function"
-#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
-#ifdef __cplusplus
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-#pragma GCC diagnostic ignored "-Wpadded"
-#pragma GCC diagnostic ignored "-Wfloat-equal"
-#if NANOPRINTF_CLANG
-#pragma GCC diagnostic ignored "-Wc++98-compat-pedantic"
-#pragma GCC diagnostic ignored "-Wcovered-switch-default"
-#pragma GCC diagnostic ignored "-Wdeclaration-after-statement"
-#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
-#ifndef __APPLE__
-#pragma GCC diagnostic ignored "-Wunsafe-buffer-usage"
-#endif
-#elif NANOPRINTF_GCC_PAST_4_6
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
-#endif
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4619) // there is no warning number 'number'
-// C4619 has to be disabled first!
-#pragma warning(disable : 4127) // conditional expression is constant
-#pragma warning(disable : 4505) // unreferenced local function has been removed
-#pragma warning(disable : 4514) // unreferenced inline function has been removed
-#pragma warning(disable : 4701) // potentially uninitialized local variable used
-#pragma warning(disable : 4706) // assignment within conditional expression
-#pragma warning(disable : 4710) // function not inlined
-#pragma warning(disable : 4711) // function selected for inline expansion
-#pragma warning(disable : 4820) // padding added after struct member
-#pragma warning(disable : 5039) // potentially throwing function passed to
-                                // extern C function
-#pragma warning(disable : 5045) // compiler will insert Spectre mitigation for
-                                // memory load
-#pragma warning(disable : 5262) // implicit switch fall-through
-#pragma warning(disable : 26812) // enum type is unscoped
-#endif
-
-#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
-#define NPF_NOINLINE __attribute__((noinline))
-#elif defined(_MSC_VER)
-#define NPF_NOINLINE __declspec(noinline)
-#else
-#define NPF_NOINLINE
-#endif
-
-#if (NANOPRINTF_USE_FIELD_WIDTH_FORMAT_SPECIFIERS == 1) ||                     \
-    (NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS == 1)
-enum {
-  NPF_FMT_SPEC_OPT_NONE,
-  NPF_FMT_SPEC_OPT_LITERAL,
-  NPF_FMT_SPEC_OPT_STAR,
-};
-#endif
-
-enum {
-  NPF_FMT_SPEC_LEN_MOD_NONE,
-  NPF_FMT_SPEC_LEN_MOD_SHORT,       // 'h'
-  NPF_FMT_SPEC_LEN_MOD_LONG_DOUBLE, // 'L'
-  NPF_FMT_SPEC_LEN_MOD_CHAR,        // 'hh'
-  NPF_FMT_SPEC_LEN_MOD_LONG,        // 'l'
-#if NANOPRINTF_USE_LARGE_FORMAT_SPECIFIERS == 1
-  NPF_FMT_SPEC_LEN_MOD_LARGE_LONG_LONG, // 'll'
-  NPF_FMT_SPEC_LEN_MOD_LARGE_INTMAX,    // 'j'
-  NPF_FMT_SPEC_LEN_MOD_LARGE_SIZET,     // 'z'
-  NPF_FMT_SPEC_LEN_MOD_LARGE_PTRDIFFT,  // 't'
-#endif
-};
-
-enum {
-  NPF_FMT_SPEC_CONV_NONE,
-  NPF_FMT_SPEC_CONV_PERCENT,    // '%'
-  NPF_FMT_SPEC_CONV_CHAR,       // 'c'
-  NPF_FMT_SPEC_CONV_STRING,     // 's'
-  NPF_FMT_SPEC_CONV_SIGNED_INT, // 'i', 'd'
-#if NANOPRINTF_USE_BINARY_FORMAT_SPECIFIERS == 1
-  NPF_FMT_SPEC_CONV_BINARY, // 'b'
-#endif
-  NPF_FMT_SPEC_CONV_OCTAL,        // 'o'
-  NPF_FMT_SPEC_CONV_HEX_INT,      // 'x', 'X'
-  NPF_FMT_SPEC_CONV_UNSIGNED_INT, // 'u'
-  NPF_FMT_SPEC_CONV_POINTER,      // 'p'
-#if NANOPRINTF_USE_WRITEBACK_FORMAT_SPECIFIERS == 1
-  NPF_FMT_SPEC_CONV_WRITEBACK, // 'n'
-#endif
-#if NANOPRINTF_USE_FLOAT_FORMAT_SPECIFIERS == 1
-  NPF_FMT_SPEC_CONV_FLOAT_DEC,      // 'f', 'F'
-  NPF_FMT_SPEC_CONV_FLOAT_SCI,      // 'e', 'E'
-  NPF_FMT_SPEC_CONV_FLOAT_SHORTEST, // 'g', 'G'
-  NPF_FMT_SPEC_CONV_FLOAT_HEX,      // 'a', 'A'
-#endif
-};
-
-typedef struct npf_format_spec {
-#if NANOPRINTF_USE_FIELD_WIDTH_FORMAT_SPECIFIERS == 1
-  int field_width;
-  uint8_t field_width_opt;
-  char left_justified;   // '-'
-  char leading_zero_pad; // '0'
-#endif
-#if NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS == 1
-  int prec;
-  uint8_t prec_opt;
-#endif
-  char prepend;     // ' ' or '+'
-  char alt_form;    // '#'
-  char case_adjust; // 'a' - 'A'
-  uint8_t length_modifier;
-  uint8_t conv_spec;
-} npf_format_spec_t;
-
-#if NANOPRINTF_USE_LARGE_FORMAT_SPECIFIERS == 0
-typedef long npf_int_t;
-typedef unsigned long npf_uint_t;
-#else
-typedef intmax_t npf_int_t;
-typedef uintmax_t npf_uint_t;
-#endif
-
-typedef struct npf_bufputc_ctx {
-  char *dst;
-  size_t len;
-  size_t cur;
-} npf_bufputc_ctx_t;
-
-#if NANOPRINTF_USE_LARGE_FORMAT_SPECIFIERS == 1
-typedef char
-    npf_size_is_ptrdiff[(sizeof(size_t) == sizeof(ptrdiff_t)) ? 1 : -1];
-typedef ptrdiff_t npf_ssize_t;
-#endif
-
-#ifdef _MSC_VER
-#include <intrin.h>
-#endif
-
-static int npf_max(int x, int y) { return (x > y) ? x : y; }
-
-static int npf_parse_format_spec(char const *format,
-                                 npf_format_spec_t *out_spec) {
-  char const *cur = format;
-
-#if NANOPRINTF_USE_FIELD_WIDTH_FORMAT_SPECIFIERS == 1
-  out_spec->left_justified = 0;
-  out_spec->leading_zero_pad = 0;
-#endif
-  out_spec->case_adjust = 'a' - 'A'; // lowercase
-  out_spec->prepend = 0;
-  out_spec->alt_form = 0;
-
-  while (*++cur) {  // cur points at the leading '%' character
-    switch (*cur) { // Optional flags
-#if NANOPRINTF_USE_FIELD_WIDTH_FORMAT_SPECIFIERS == 1
-    case '-':
-      out_spec->left_justified = '-';
-      out_spec->leading_zero_pad = 0;
-      continue;
-    case '0':
-      out_spec->leading_zero_pad = !out_spec->left_justified;
-      continue;
-#endif
-    case '+':
-      out_spec->prepend = '+';
-      continue;
-    case ' ':
-      if (out_spec->prepend == 0) {
-        out_spec->prepend = ' ';
-      }
-      continue;
-    case '#':
-      out_spec->alt_form = '#';
-      continue;
-    default:
-      break;
-    }
-    break;
-  }
-
-#if NANOPRINTF_USE_FIELD_WIDTH_FORMAT_SPECIFIERS == 1
-  out_spec->field_width_opt = NPF_FMT_SPEC_OPT_NONE;
-  if (*cur == '*') {
-    out_spec->field_width_opt = NPF_FMT_SPEC_OPT_STAR;
-    ++cur;
-  } else {
-    out_spec->field_width = 0;
-    while ((*cur >= '0') && (*cur <= '9')) {
-      out_spec->field_width_opt = NPF_FMT_SPEC_OPT_LITERAL;
-      out_spec->field_width = (out_spec->field_width * 10) + (*cur++ - '0');
-    }
-  }
-#endif
-
-#if NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS == 1
-  out_spec->prec = 0;
-  out_spec->prec_opt = NPF_FMT_SPEC_OPT_NONE;
-  if (*cur == '.') {
-    ++cur;
-    if (*cur == '*') {
-      out_spec->prec_opt = NPF_FMT_SPEC_OPT_STAR;
-      ++cur;
-    } else {
-      if (*cur == '-') {
-        ++cur;
-      } else {
-        out_spec->prec_opt = NPF_FMT_SPEC_OPT_LITERAL;
-      }
-      while ((*cur >= '0') && (*cur <= '9')) {
-        out_spec->prec = (out_spec->prec * 10) + (*cur++ - '0');
-      }
-    }
-  }
-#endif
-
-  uint_fast8_t tmp_conv = NPF_FMT_SPEC_CONV_NONE;
-  out_spec->length_modifier = NPF_FMT_SPEC_LEN_MOD_NONE;
-  switch (*cur++) { // Length modifier
-  case 'h':
-    out_spec->length_modifier = NPF_FMT_SPEC_LEN_MOD_SHORT;
-    if (*cur == 'h') {
-      out_spec->length_modifier = NPF_FMT_SPEC_LEN_MOD_CHAR;
-      ++cur;
-    }
-    break;
-  case 'l':
-    out_spec->length_modifier = NPF_FMT_SPEC_LEN_MOD_LONG;
-#if NANOPRINTF_USE_LARGE_FORMAT_SPECIFIERS == 1
-    if (*cur == 'l') {
-      out_spec->length_modifier = NPF_FMT_SPEC_LEN_MOD_LARGE_LONG_LONG;
-      ++cur;
-    }
-#endif
-    break;
-#if NANOPRINTF_USE_FLOAT_FORMAT_SPECIFIERS == 1
-  case 'L':
-    out_spec->length_modifier = NPF_FMT_SPEC_LEN_MOD_LONG_DOUBLE;
-    break;
-#endif
-#if NANOPRINTF_USE_LARGE_FORMAT_SPECIFIERS == 1
-  case 'j':
-    out_spec->length_modifier = NPF_FMT_SPEC_LEN_MOD_LARGE_INTMAX;
-    break;
-  case 'z':
-    out_spec->length_modifier = NPF_FMT_SPEC_LEN_MOD_LARGE_SIZET;
-    break;
-  case 't':
-    out_spec->length_modifier = NPF_FMT_SPEC_LEN_MOD_LARGE_PTRDIFFT;
-    break;
-#endif
-  default:
-    --cur;
-    break;
-  }
-
-  switch (*cur++) { // Conversion specifier
-  case '%':
-    out_spec->conv_spec = NPF_FMT_SPEC_CONV_PERCENT;
-#if NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS == 1
-    out_spec->prec_opt = NPF_FMT_SPEC_OPT_NONE;
-#endif
-    break;
-
-  case 'c':
-    out_spec->conv_spec = NPF_FMT_SPEC_CONV_CHAR;
-#if NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS == 1
-    out_spec->prec_opt = NPF_FMT_SPEC_OPT_NONE;
-#endif
-    break;
-
-  case 's':
-    out_spec->conv_spec = NPF_FMT_SPEC_CONV_STRING;
-#if NANOPRINTF_USE_FIELD_WIDTH_FORMAT_SPECIFIERS == 1
-    out_spec->leading_zero_pad = 0;
-#endif
-    break;
-
-  case 'i':
-  case 'd':
-    tmp_conv = NPF_FMT_SPEC_CONV_SIGNED_INT;
-  case 'o':
-    if (tmp_conv == NPF_FMT_SPEC_CONV_NONE) {
-      tmp_conv = NPF_FMT_SPEC_CONV_OCTAL;
-    }
-  case 'u':
-    if (tmp_conv == NPF_FMT_SPEC_CONV_NONE) {
-      tmp_conv = NPF_FMT_SPEC_CONV_UNSIGNED_INT;
-    }
-  case 'X':
-    if (tmp_conv == NPF_FMT_SPEC_CONV_NONE) {
-      out_spec->case_adjust = 0;
-    }
-  case 'x':
-    if (tmp_conv == NPF_FMT_SPEC_CONV_NONE) {
-      tmp_conv = NPF_FMT_SPEC_CONV_HEX_INT;
-    }
-    out_spec->conv_spec = (uint8_t)tmp_conv;
-#if (NANOPRINTF_USE_FIELD_WIDTH_FORMAT_SPECIFIERS == 1) &&                     \
-    (NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS == 1)
-    if (out_spec->prec_opt != NPF_FMT_SPEC_OPT_NONE) {
-      out_spec->leading_zero_pad = 0;
-    }
-#endif
-    break;
-
-#if NANOPRINTF_USE_FLOAT_FORMAT_SPECIFIERS == 1
-  case 'F':
-    out_spec->case_adjust = 0;
-  case 'f':
-    out_spec->conv_spec = NPF_FMT_SPEC_CONV_FLOAT_DEC;
-    if (out_spec->prec_opt == NPF_FMT_SPEC_OPT_NONE) {
-      out_spec->prec = 6;
-    }
-    break;
-
-  case 'E':
-    out_spec->case_adjust = 0;
-  case 'e':
-    out_spec->conv_spec = NPF_FMT_SPEC_CONV_FLOAT_SCI;
-    if (out_spec->prec_opt == NPF_FMT_SPEC_OPT_NONE) {
-      out_spec->prec = 6;
-    }
-    break;
-
-  case 'G':
-    out_spec->case_adjust = 0;
-  case 'g':
-    out_spec->conv_spec = NPF_FMT_SPEC_CONV_FLOAT_SHORTEST;
-    if (out_spec->prec_opt == NPF_FMT_SPEC_OPT_NONE) {
-      out_spec->prec = 6;
-    }
-    break;
-
-  case 'A':
-    out_spec->case_adjust = 0;
-  case 'a':
-    out_spec->conv_spec = NPF_FMT_SPEC_CONV_FLOAT_HEX;
-    if (out_spec->prec_opt == NPF_FMT_SPEC_OPT_NONE) {
-      out_spec->prec = 6;
-    }
-    break;
-#endif
-
-#if NANOPRINTF_USE_WRITEBACK_FORMAT_SPECIFIERS == 1
-  case 'n':
-    // todo: reject string if flags or width or precision exist
-    out_spec->conv_spec = NPF_FMT_SPEC_CONV_WRITEBACK;
-#if NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS == 1
-    out_spec->prec_opt = NPF_FMT_SPEC_OPT_NONE;
-#endif
-    break;
-#endif
-
-  case 'p':
-    out_spec->conv_spec = NPF_FMT_SPEC_CONV_POINTER;
-#if NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS == 1
-    out_spec->prec_opt = NPF_FMT_SPEC_OPT_NONE;
-#endif
-    break;
-
-#if NANOPRINTF_USE_BINARY_FORMAT_SPECIFIERS == 1
-  case 'B':
-    out_spec->case_adjust = 0;
-  case 'b':
-    out_spec->conv_spec = NPF_FMT_SPEC_CONV_BINARY;
-    break;
-#endif
-
-  default:
-    return 0;
-  }
-
-  return (int)(cur - format);
-}
-
-static NPF_NOINLINE int npf_utoa_rev(npf_uint_t val, char *buf,
-                                     uint_fast8_t base, char case_adj) {
-  uint_fast8_t n = 0;
-  do {
-    int_fast8_t const d = (int_fast8_t)(val % base);
-    *buf++ = (char)(((d < 10) ? '0' : ('A' - 10 + case_adj)) + d);
-    ++n;
-    val /= base;
-  } while (val);
-  return (int)n;
-}
-
-#if NANOPRINTF_USE_FLOAT_FORMAT_SPECIFIERS == 1
-
-#include <float.h>
-
-#if (DBL_MANT_DIG <= 11) && (DBL_MAX_EXP <= 16)
-typedef uint_fast16_t npf_double_bin_t;
-typedef int_fast8_t npf_ftoa_exp_t;
-#elif (DBL_MANT_DIG <= 24) && (DBL_MAX_EXP <= 128)
-typedef uint_fast32_t npf_double_bin_t;
-typedef int_fast8_t npf_ftoa_exp_t;
-#elif (DBL_MANT_DIG <= 53) && (DBL_MAX_EXP <= 1024)
-typedef uint_fast64_t npf_double_bin_t;
-typedef int_fast16_t npf_ftoa_exp_t;
-#else
-#error Unsupported width of the double type.
-#endif
-
-// The floating point conversion code works with an unsigned integer type of any
-// size.
-#ifndef NANOPRINTF_CONVERSION_FLOAT_TYPE
-#define NANOPRINTF_CONVERSION_FLOAT_TYPE unsigned int
-#endif
-typedef NANOPRINTF_CONVERSION_FLOAT_TYPE npf_ftoa_man_t;
-
-#if (NANOPRINTF_CONVERSION_BUFFER_SIZE <= UINT_FAST8_MAX) &&                   \
-    (UINT_FAST8_MAX <= INT_MAX)
-typedef uint_fast8_t npf_ftoa_dec_t;
-#else
-typedef int npf_ftoa_dec_t;
-#endif
-
-enum {
-  NPF_DOUBLE_EXP_MASK = DBL_MAX_EXP * 2 - 1,
-  NPF_DOUBLE_EXP_BIAS = DBL_MAX_EXP - 1,
-  NPF_DOUBLE_MAN_BITS = DBL_MANT_DIG - 1,
-  NPF_DOUBLE_BIN_BITS = sizeof(npf_double_bin_t) * CHAR_BIT,
-  NPF_FTOA_MAN_BITS = sizeof(npf_ftoa_man_t) * CHAR_BIT,
-  NPF_FTOA_SHIFT_BITS =
-      ((NPF_FTOA_MAN_BITS < DBL_MANT_DIG) ? NPF_FTOA_MAN_BITS : DBL_MANT_DIG) -
-      1
-};
-
-/* Generally, floating-point conversion implementations use
-   grisu2 (https://bit.ly/2JgMggX) and ryu (https://bit.ly/2RLXSg0) algorithms,
-   which are mathematically exact and fast, but require large lookup tables.
-
-   This implementation was inspired by Wojciech Muła's (zdjęcia@garnek.pl)
-   algorithm (http://0x80.pl/notesen/2015-12-29-float-to-string.html) and
-   extended further by adding dynamic scaling and configurable integer width by
-   Oskars Rubenis (https://github.com/Okarss). */
-
-static int npf_ftoa_rev(char *buf, npf_format_spec_t const *spec, double f) {
-  char const *ret = NULL;
-  npf_double_bin_t bin;
-  { // Union-cast is UB pre-C11, compiler optimizes byte-copy loop.
-    char const *src = (char const *)&f;
-    char *dst = (char *)&bin;
-    for (uint_fast8_t i = 0; i < sizeof(f); ++i) {
-      dst[i] = src[i];
-    }
-  }
-
-  // Unsigned -> signed int casting is IB and can raise a signal but generally
-  // doesn't.
-  npf_ftoa_exp_t exp =
-      (npf_ftoa_exp_t)((npf_ftoa_exp_t)(bin >> NPF_DOUBLE_MAN_BITS) &
-                       NPF_DOUBLE_EXP_MASK);
-
-  bin &= ((npf_double_bin_t)0x1 << NPF_DOUBLE_MAN_BITS) - 1;
-  if (exp == (npf_ftoa_exp_t)NPF_DOUBLE_EXP_MASK) { // special value
-    ret = (bin) ? "NAN" : "FNI";
-    goto exit;
-  }
-  if (spec->prec > (NANOPRINTF_CONVERSION_BUFFER_SIZE - 2)) {
-    goto exit;
-  }
-  if (exp) { // normal number
-    bin |= (npf_double_bin_t)0x1 << NPF_DOUBLE_MAN_BITS;
-  } else { // subnormal number
-    ++exp;
-  }
-  exp = (npf_ftoa_exp_t)(exp - NPF_DOUBLE_EXP_BIAS);
-
-  uint_fast8_t carry;
-  carry = 0;
-  npf_ftoa_dec_t end, dec;
-  dec = (npf_ftoa_dec_t)spec->prec;
-  if (dec || spec->alt_form) {
-    buf[dec++] = '.';
-  }
-
-  { // Integer part
-    npf_ftoa_man_t man_i;
-
-    if (exp >= 0) {
-      int_fast8_t shift_i =
-          (int_fast8_t)((exp > NPF_FTOA_SHIFT_BITS) ? (int)NPF_FTOA_SHIFT_BITS
-                                                    : exp);
-      npf_ftoa_exp_t exp_i = (npf_ftoa_exp_t)(exp - shift_i);
-      shift_i = (int_fast8_t)(NPF_DOUBLE_MAN_BITS - shift_i);
-      man_i = (npf_ftoa_man_t)(bin >> shift_i);
-
-      if (exp_i) {
-        if (shift_i) {
-          carry = (bin >> (shift_i - 1)) & 0x1;
-        }
-        exp = NPF_DOUBLE_MAN_BITS; // invalidate the fraction part
-      }
-
-      // Scale the exponent from base-2 to base-10.
-      for (; exp_i; --exp_i) {
-        if (!(man_i & ((npf_ftoa_man_t)0x1 << (NPF_FTOA_MAN_BITS - 1)))) {
-          man_i = (npf_ftoa_man_t)(man_i << 1);
-          man_i = (npf_ftoa_man_t)(man_i | carry);
-          carry = 0;
-        } else {
-          if (dec >= NANOPRINTF_CONVERSION_BUFFER_SIZE) {
-            goto exit;
-          }
-          buf[dec++] = '0';
-          carry = (((uint_fast8_t)(man_i % 5) + carry) > 2);
-          man_i /= 5;
-        }
-      }
-    } else {
-      man_i = 0;
-    }
-    end = dec;
-
-    do { // Print the integer
-      if (end >= NANOPRINTF_CONVERSION_BUFFER_SIZE) {
-        goto exit;
-      }
-      buf[end++] = (char)('0' + (char)(man_i % 10));
-      man_i /= 10;
-    } while (man_i);
-  }
-
-  { // Fraction part
-    npf_ftoa_man_t man_f;
-    npf_ftoa_dec_t dec_f = (npf_ftoa_dec_t)spec->prec;
-
-    if (exp < NPF_DOUBLE_MAN_BITS) {
-      int_fast8_t shift_f = (int_fast8_t)((exp < 0) ? -1 : exp);
-      npf_ftoa_exp_t exp_f = (npf_ftoa_exp_t)(exp - shift_f);
-      npf_double_bin_t bin_f =
-          bin << ((NPF_DOUBLE_BIN_BITS - NPF_DOUBLE_MAN_BITS) + shift_f);
-
-      // This if-else statement can be completely optimized at compile time.
-      if (NPF_DOUBLE_BIN_BITS > NPF_FTOA_MAN_BITS) {
-        man_f = (npf_ftoa_man_t)(bin_f >> ((unsigned)(NPF_DOUBLE_BIN_BITS -
-                                                      NPF_FTOA_MAN_BITS) %
-                                           NPF_DOUBLE_BIN_BITS));
-        carry = (uint_fast8_t)((bin_f >> ((unsigned)(NPF_DOUBLE_BIN_BITS -
-                                                     NPF_FTOA_MAN_BITS - 1) %
-                                          NPF_DOUBLE_BIN_BITS)) &
-                               0x1);
-      } else {
-        man_f = (npf_ftoa_man_t)((npf_ftoa_man_t)bin_f
-                                 << ((unsigned)(NPF_FTOA_MAN_BITS -
-                                                NPF_DOUBLE_BIN_BITS) %
-                                     NPF_FTOA_MAN_BITS));
-        carry = 0;
-      }
-
-      // Scale the exponent from base-2 to base-10 and prepare the first digit.
-      for (uint_fast8_t digit = 0; dec_f && (exp_f < 4); ++exp_f) {
-        if ((man_f > ((npf_ftoa_man_t)-4 / 5)) || digit) {
-          carry = (uint_fast8_t)(man_f & 0x1);
-          man_f = (npf_ftoa_man_t)(man_f >> 1);
-        } else {
-          man_f = (npf_ftoa_man_t)(man_f * 5);
-          if (carry) {
-            man_f = (npf_ftoa_man_t)(man_f + 3);
-            carry = 0;
-          }
-          if (exp_f < 0) {
-            buf[--dec_f] = '0';
-          } else {
-            ++digit;
-          }
-        }
-      }
-      man_f = (npf_ftoa_man_t)(man_f + carry);
-      carry = (exp_f >= 0);
-      dec = 0;
-    } else {
-      man_f = 0;
-    }
-
-    if (dec_f) {
-      // Print the fraction
-      for (;;) {
-        buf[--dec_f] = (char)('0' + (char)(man_f >> (NPF_FTOA_MAN_BITS - 4)));
-        man_f = (npf_ftoa_man_t)(man_f & ~((npf_ftoa_man_t)0xF
-                                           << (NPF_FTOA_MAN_BITS - 4)));
-        if (!dec_f) {
-          break;
-        }
-        man_f = (npf_ftoa_man_t)(man_f * 10);
-      }
-      man_f = (npf_ftoa_man_t)(man_f << 4);
-    }
-    if (exp < NPF_DOUBLE_MAN_BITS) {
-      carry &= (uint_fast8_t)(man_f >> (NPF_FTOA_MAN_BITS - 1));
-    }
-  }
-
-  // Round the number
-  for (; carry; ++dec) {
-    if (dec >= NANOPRINTF_CONVERSION_BUFFER_SIZE) {
-      goto exit;
-    }
-    if (dec >= end) {
-      buf[end++] = '0';
-    }
-    if (buf[dec] == '.') {
-      continue;
-    }
-    carry = (buf[dec] == '9');
-    buf[dec] = (char)(carry ? '0' : (buf[dec] + 1));
-  }
-
-  return (int)end;
-exit:
-  if (!ret) {
-    ret = "RRE";
-  }
-  uint_fast8_t i;
-  for (i = 0; ret[i]; ++i) {
-    buf[i] = (char)(ret[i] + spec->case_adjust);
-  }
-  return (int)i;
-}
-
-#endif // NANOPRINTF_USE_FLOAT_FORMAT_SPECIFIERS
-
-#if NANOPRINTF_USE_BINARY_FORMAT_SPECIFIERS == 1
-static int npf_bin_len(npf_uint_t u) {
-  // Return the length of the binary string format of 'u', preferring
-  // intrinsics.
-  if (!u) {
-    return 1;
-  }
-
-#ifdef _MSC_VER // Win64, use _BSR64 for everything. If x86, use _BSR when
-                // non-large.
-#ifdef _M_X64
-#define NPF_HAVE_BUILTIN_CLZ
-#define NPF_CLZ _BitScanReverse64
-#elif NANOPRINTF_USE_LARGE_FORMAT_SPECIFIERS == 0
-#define NPF_HAVE_BUILTIN_CLZ
-#define NPF_CLZ _BitScanReverse
-#endif
-#ifdef NPF_HAVE_BUILTIN_CLZ
-  unsigned long idx;
-  NPF_CLZ(&idx, u);
-  return (int)(idx + 1);
-#endif
-#elif NANOPRINTF_CLANG || NANOPRINTF_GCC_PAST_4_6
-#define NPF_HAVE_BUILTIN_CLZ
-#if NANOPRINTF_USE_LARGE_FORMAT_SPECIFIERS == 1
-#define NPF_CLZ(X) ((sizeof(long long) * CHAR_BIT) - (size_t)__builtin_clzll(X))
-#else
-#define NPF_CLZ(X) ((sizeof(long) * CHAR_BIT) - (size_t)__builtin_clzl(X))
-#endif
-  return (int)NPF_CLZ(u);
-#endif
-
-#ifndef NPF_HAVE_BUILTIN_CLZ
-  int n;
-  for (n = 0; u; ++n, u >>= 1)
-    ; // slow but small software fallback
-  return n;
-#else
-#undef NPF_HAVE_BUILTIN_CLZ
-#undef NPF_CLZ
-#endif
-}
-#endif
-
-static void npf_bufputc(int c, void *ctx) {
-  npf_bufputc_ctx_t *bpc = (npf_bufputc_ctx_t *)ctx;
-  if (bpc->cur < bpc->len) {
-    bpc->dst[bpc->cur++] = (char)c;
-  }
-}
-
-static void npf_bufputc_nop(int c, void *ctx) {
-  (void)c;
-  (void)ctx;
-}
-
-typedef struct npf_cnt_putc_ctx {
-  npf_putc pc;
-  void *ctx;
-  int n;
-} npf_cnt_putc_ctx_t;
-
-static void npf_putc_cnt(int c, void *ctx) {
-  npf_cnt_putc_ctx_t *pc_cnt = (npf_cnt_putc_ctx_t *)ctx;
-  ++pc_cnt->n;
-  pc_cnt->pc(c, pc_cnt->ctx); // sibling-call optimization
-}
-
-#define NPF_PUTC(VAL)                                                          \
-  do {                                                                         \
-    npf_putc_cnt((int)(VAL), &pc_cnt);                                         \
-  } while (0)
-
-#define NPF_EXTRACT(MOD, CAST_TO, EXTRACT_AS)                                  \
-  case NPF_FMT_SPEC_LEN_MOD_##MOD:                                             \
-    val = (CAST_TO)va_arg(args, EXTRACT_AS);                                   \
-    break
-
-#define NPF_WRITEBACK(MOD, TYPE)                                               \
-  case NPF_FMT_SPEC_LEN_MOD_##MOD:                                             \
-    *(va_arg(args, TYPE *)) = (TYPE)pc_cnt.n;                                  \
-    break
-
-int npf_vpprintf(npf_putc pc, void *pc_ctx, char const *format, va_list args) {
-  npf_format_spec_t fs;
-  char const *cur = format;
-  npf_cnt_putc_ctx_t pc_cnt;
-  pc_cnt.pc = pc;
-  pc_cnt.ctx = pc_ctx;
-  pc_cnt.n = 0;
-
-  while (*cur) {
-    int const fs_len = (*cur != '%') ? 0 : npf_parse_format_spec(cur, &fs);
-    if (!fs_len) {
-      NPF_PUTC(*cur++);
-      continue;
-    }
-    cur += fs_len;
-
-    // Extract star-args immediately
-#if NANOPRINTF_USE_FIELD_WIDTH_FORMAT_SPECIFIERS == 1
-    if (fs.field_width_opt == NPF_FMT_SPEC_OPT_STAR) {
-      fs.field_width = va_arg(args, int);
-      if (fs.field_width < 0) {
-        fs.field_width = -fs.field_width;
-        fs.left_justified = 1;
-      }
-    }
-#endif
-#if NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS == 1
-    if (fs.prec_opt == NPF_FMT_SPEC_OPT_STAR) {
-      fs.prec = va_arg(args, int);
-      if (fs.prec < 0) {
-        fs.prec_opt = NPF_FMT_SPEC_OPT_NONE;
-      }
-    }
-#endif
-
-    union {
-      char cbuf_mem[NANOPRINTF_CONVERSION_BUFFER_SIZE];
-      npf_uint_t binval;
-    } u;
-    char *cbuf = u.cbuf_mem, sign_c = 0;
-    int cbuf_len = 0, need_0x = 0;
-#if NANOPRINTF_USE_FIELD_WIDTH_FORMAT_SPECIFIERS == 1
-    int field_pad = 0;
-    char pad_c = 0;
-#endif
-#if NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS == 1
-    int prec_pad = 0;
-#if NANOPRINTF_USE_FIELD_WIDTH_FORMAT_SPECIFIERS == 1
-    int zero = 0;
-#endif
-#endif
-
-    // Extract and convert the argument to string, point cbuf at the text.
-    switch (fs.conv_spec) {
-    case NPF_FMT_SPEC_CONV_PERCENT:
-      *cbuf = '%';
-      cbuf_len = 1;
-      break;
-
-    case NPF_FMT_SPEC_CONV_CHAR:
-      *cbuf = (char)va_arg(args, int);
-      cbuf_len = 1;
-      break;
-
-    case NPF_FMT_SPEC_CONV_STRING: {
-      cbuf = va_arg(args, char *);
-#if NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS == 1
-      for (char const *s = cbuf;
-           ((fs.prec_opt == NPF_FMT_SPEC_OPT_NONE) || (cbuf_len < fs.prec)) &&
-           *s;
-           ++s, ++cbuf_len)
-        ;
-#else
-      for (char const *s = cbuf; *s; ++s, ++cbuf_len)
-        ; // strlen
-#endif
-    } break;
-
-    case NPF_FMT_SPEC_CONV_SIGNED_INT: {
-      npf_int_t val = 0;
-      switch (fs.length_modifier) {
-        NPF_EXTRACT(NONE, int, int);
-        NPF_EXTRACT(SHORT, short, int);
-        NPF_EXTRACT(LONG_DOUBLE, int, int);
-        NPF_EXTRACT(CHAR, char, int);
-        NPF_EXTRACT(LONG, long, long);
-#if NANOPRINTF_USE_LARGE_FORMAT_SPECIFIERS == 1
-        NPF_EXTRACT(LARGE_LONG_LONG, long long, long long);
-        NPF_EXTRACT(LARGE_INTMAX, intmax_t, intmax_t);
-        NPF_EXTRACT(LARGE_SIZET, npf_ssize_t, npf_ssize_t);
-        NPF_EXTRACT(LARGE_PTRDIFFT, ptrdiff_t, ptrdiff_t);
-#endif
-      default:
-        break;
-      }
-
-      sign_c = (val < 0) ? '-' : fs.prepend;
-
-#if NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS == 1
-#if NANOPRINTF_USE_FIELD_WIDTH_FORMAT_SPECIFIERS == 1
-      zero = !val;
-#endif
-      // special case, if prec and value are 0, skip
-      if (!val && (fs.prec_opt != NPF_FMT_SPEC_OPT_NONE) && !fs.prec) {
-        cbuf_len = 0;
-      } else
-#endif
-      {
-        npf_uint_t uval = (npf_uint_t)val;
-        if (val < 0) {
-          uval = 0 - uval;
-        }
-        cbuf_len = npf_utoa_rev(uval, cbuf, 10, fs.case_adjust);
-      }
-    } break;
-
-#if NANOPRINTF_USE_BINARY_FORMAT_SPECIFIERS == 1
-    case NPF_FMT_SPEC_CONV_BINARY:
-#endif
-    case NPF_FMT_SPEC_CONV_OCTAL:
-    case NPF_FMT_SPEC_CONV_HEX_INT:
-    case NPF_FMT_SPEC_CONV_UNSIGNED_INT: {
-      npf_uint_t val = 0;
-
-      switch (fs.length_modifier) {
-        NPF_EXTRACT(NONE, unsigned, unsigned);
-        NPF_EXTRACT(SHORT, unsigned short, unsigned);
-        NPF_EXTRACT(LONG_DOUBLE, unsigned, unsigned);
-        NPF_EXTRACT(CHAR, unsigned char, unsigned);
-        NPF_EXTRACT(LONG, unsigned long, unsigned long);
-#if NANOPRINTF_USE_LARGE_FORMAT_SPECIFIERS == 1
-        NPF_EXTRACT(LARGE_LONG_LONG, unsigned long long, unsigned long long);
-        NPF_EXTRACT(LARGE_INTMAX, uintmax_t, uintmax_t);
-        NPF_EXTRACT(LARGE_SIZET, size_t, size_t);
-        NPF_EXTRACT(LARGE_PTRDIFFT, size_t, size_t);
-#endif
-      default:
-        break;
-      }
-
-#if NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS == 1
-#if NANOPRINTF_USE_FIELD_WIDTH_FORMAT_SPECIFIERS == 1
-      zero = !val;
-#endif
-      if (!val && (fs.prec_opt != NPF_FMT_SPEC_OPT_NONE) && !fs.prec) {
-        // Zero value and explicitly-requested zero precision means "print
-        // nothing".
-        if ((fs.conv_spec == NPF_FMT_SPEC_CONV_OCTAL) && fs.alt_form) {
-          fs.prec = 1; // octal special case, print a single '0'
-        }
-      } else
-#endif
-#if NANOPRINTF_USE_BINARY_FORMAT_SPECIFIERS == 1
-          if (fs.conv_spec == NPF_FMT_SPEC_CONV_BINARY) {
-        cbuf_len = npf_bin_len(val);
-        u.binval = val;
-      } else
-#endif
-      {
-        uint_fast8_t const base =
-            (fs.conv_spec == NPF_FMT_SPEC_CONV_OCTAL)
-                ? 8u
-                : ((fs.conv_spec == NPF_FMT_SPEC_CONV_HEX_INT) ? 16u : 10u);
-        cbuf_len = npf_utoa_rev(val, cbuf, base, fs.case_adjust);
-      }
-
-      if (val && fs.alt_form && (fs.conv_spec == NPF_FMT_SPEC_CONV_OCTAL)) {
-        cbuf[cbuf_len++] = '0'; // OK to add leading octal '0' immediately.
-      }
-
-      if (val && fs.alt_form) { // 0x or 0b but can't write it yet.
-        if (fs.conv_spec == NPF_FMT_SPEC_CONV_HEX_INT) {
-          need_0x = 'X';
-        }
-#if NANOPRINTF_USE_BINARY_FORMAT_SPECIFIERS == 1
-        else if (fs.conv_spec == NPF_FMT_SPEC_CONV_BINARY) {
-          need_0x = 'B';
-        }
-#endif
-        if (need_0x) {
-          need_0x += fs.case_adjust;
-        }
-      }
-    } break;
-
-    case NPF_FMT_SPEC_CONV_POINTER: {
-      cbuf_len = npf_utoa_rev((npf_uint_t)(uintptr_t)va_arg(args, void *), cbuf,
-                              16, 'a' - 'A');
-      need_0x = 'x';
-    } break;
-
-#if NANOPRINTF_USE_WRITEBACK_FORMAT_SPECIFIERS == 1
-    case NPF_FMT_SPEC_CONV_WRITEBACK:
-      switch (fs.length_modifier) {
-        NPF_WRITEBACK(NONE, int);
-        NPF_WRITEBACK(SHORT, short);
-        NPF_WRITEBACK(LONG, long);
-        NPF_WRITEBACK(LONG_DOUBLE, double);
-        NPF_WRITEBACK(CHAR, signed char);
-#if NANOPRINTF_USE_LARGE_FORMAT_SPECIFIERS == 1
-        NPF_WRITEBACK(LARGE_LONG_LONG, long long);
-        NPF_WRITEBACK(LARGE_INTMAX, intmax_t);
-        NPF_WRITEBACK(LARGE_SIZET, size_t);
-        NPF_WRITEBACK(LARGE_PTRDIFFT, ptrdiff_t);
-#endif
-      default:
-        break;
-      }
-      break;
-#endif
-
-#if NANOPRINTF_USE_FLOAT_FORMAT_SPECIFIERS == 1
-    case NPF_FMT_SPEC_CONV_FLOAT_DEC:
-    case NPF_FMT_SPEC_CONV_FLOAT_SCI:
-    case NPF_FMT_SPEC_CONV_FLOAT_SHORTEST:
-    case NPF_FMT_SPEC_CONV_FLOAT_HEX: {
-      double val;
-      if (fs.length_modifier == NPF_FMT_SPEC_LEN_MOD_LONG_DOUBLE) {
-        val = (double)va_arg(args, long double);
-      } else {
-        val = va_arg(args, double);
-      }
-
-      sign_c = (val < 0.) ? '-' : fs.prepend;
-#if NANOPRINTF_USE_FIELD_WIDTH_FORMAT_SPECIFIERS == 1
-      zero = (val == 0.);
-#endif
-      cbuf_len = npf_ftoa_rev(cbuf, &fs, val);
-    } break;
-#endif
-    default:
-      break;
-    }
-
-#if NANOPRINTF_USE_FIELD_WIDTH_FORMAT_SPECIFIERS == 1
-    // Compute the field width pad character
-    if (fs.field_width_opt != NPF_FMT_SPEC_OPT_NONE) {
-      if (fs.leading_zero_pad) { // '0' flag is only legal with numeric types
-        if ((fs.conv_spec != NPF_FMT_SPEC_CONV_STRING) &&
-            (fs.conv_spec != NPF_FMT_SPEC_CONV_CHAR) &&
-            (fs.conv_spec != NPF_FMT_SPEC_CONV_PERCENT)) {
-#if NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS == 1
-          if ((fs.prec_opt != NPF_FMT_SPEC_OPT_NONE) && !fs.prec && zero) {
-            pad_c = ' ';
-          } else
-#endif
-          {
-            pad_c = '0';
-          }
-        }
-      } else {
-        pad_c = ' ';
-      }
-    }
-#endif
-
-    // Compute the number of bytes to truncate or '0'-pad.
-#if NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS == 1
-    if (fs.conv_spec != NPF_FMT_SPEC_CONV_STRING) {
-#if NANOPRINTF_USE_FLOAT_FORMAT_SPECIFIERS == 1
-      // float precision is after the decimal point
-      if (fs.conv_spec != NPF_FMT_SPEC_CONV_FLOAT_DEC)
-#endif
-      {
-        prec_pad = npf_max(0, fs.prec - cbuf_len);
-      }
-    }
-#endif
-
-#if NANOPRINTF_USE_FIELD_WIDTH_FORMAT_SPECIFIERS == 1
-    // Given the full converted length, how many pad bytes?
-    field_pad = fs.field_width - cbuf_len - !!sign_c;
-    if (need_0x) {
-      field_pad -= 2;
-    }
-#if NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS == 1
-    field_pad -= prec_pad;
-#endif
-    field_pad = npf_max(0, field_pad);
-
-    // Apply right-justified field width if requested
-    if (!fs.left_justified && pad_c) { // If leading zeros pad, sign goes first.
-      if (pad_c == '0') {
-        if (sign_c) {
-          NPF_PUTC(sign_c);
-          sign_c = 0;
-        }
-        // Pad byte is '0', write '0x' before '0' pad chars.
-        if (need_0x) {
-          NPF_PUTC('0');
-          NPF_PUTC(need_0x);
-        }
-      }
-      while (field_pad-- > 0) {
-        NPF_PUTC(pad_c);
-      }
-      // Pad byte is ' ', write '0x' after ' ' pad chars but before number.
-      if ((pad_c != '0') && need_0x) {
-        NPF_PUTC('0');
-        NPF_PUTC(need_0x);
-      }
-    } else
-#endif
-    {
-      if (need_0x) {
-        NPF_PUTC('0');
-        NPF_PUTC(need_0x);
-      }
-    } // no pad, '0x' requested.
-
-    // Write the converted payload
-    if (fs.conv_spec == NPF_FMT_SPEC_CONV_STRING) {
-      for (int i = 0; i < cbuf_len; ++i) {
-        NPF_PUTC(cbuf[i]);
-      }
-    } else {
-      if (sign_c) {
-        NPF_PUTC(sign_c);
-      }
-#if NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS == 1
-      while (prec_pad-- > 0) {
-        NPF_PUTC('0');
-      } // int precision leads.
-#endif
-#if NANOPRINTF_USE_BINARY_FORMAT_SPECIFIERS == 1
-      if (fs.conv_spec == NPF_FMT_SPEC_CONV_BINARY) {
-        while (cbuf_len) {
-          NPF_PUTC('0' + ((u.binval >> --cbuf_len) & 1));
-        }
-      } else
-#endif
-      {
-        while (cbuf_len-- > 0) {
-          NPF_PUTC(cbuf[cbuf_len]);
-        }
-      } // payload is reversed
-    }
-
-#if NANOPRINTF_USE_FIELD_WIDTH_FORMAT_SPECIFIERS == 1
-    if (fs.left_justified && pad_c) { // Apply left-justified field width
-      while (field_pad-- > 0) {
-        NPF_PUTC(pad_c);
-      }
-    }
-#endif
-  }
-
-  return pc_cnt.n;
-}
-
-#undef NPF_PUTC
-#undef NPF_EXTRACT
-#undef NPF_WRITEBACK
-
-int npf_pprintf(npf_putc pc, void *pc_ctx, char const *format, ...) {
-  va_list val;
-  va_start(val, format);
-  int const rv = npf_vpprintf(pc, pc_ctx, format, val);
-  va_end(val);
-  return rv;
-}
-
-int npf_snprintf(char *buffer, size_t bufsz, const char *format, ...) {
-  va_list val;
-  va_start(val, format);
-  int const rv = npf_vsnprintf(buffer, bufsz, format, val);
-  va_end(val);
-  return rv;
-}
-
-int npf_vsnprintf(char *buffer, size_t bufsz, char const *format,
-                  va_list vlist) {
-  npf_bufputc_ctx_t bufputc_ctx;
-  bufputc_ctx.dst = buffer;
-  bufputc_ctx.len = bufsz;
-  bufputc_ctx.cur = 0;
-
-  npf_putc const pc = buffer ? npf_bufputc : npf_bufputc_nop;
-  int const n = npf_vpprintf(pc, &bufputc_ctx, format, vlist);
-  pc('\0', &bufputc_ctx);
-
-  if (buffer && bufsz) {
-#ifdef NANOPRINTF_SNPRINTF_SAFE_EMPTY_STRING_ON_OVERFLOW
-    if (n >= (int)bufsz) {
-      buffer[0] = '\0';
-    }
-#else
-    buffer[bufsz - 1] = '\0';
-#endif
-  }
-
-  return n;
-}
-
-#if NANOPRINTF_HAVE_GCC_WARNING_PRAGMAS
-#pragma GCC diagnostic pop
-#endif
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-#endif // NANOPRINTF_IMPLEMENTATION_INCLUDED
-#endif // NANOPRINTF_IMPLEMENTATION
-
-/*
-  nanoprintf is dual-licensed under both the "Unlicense" and the
-  "Zero-Clause BSD" (0BSD) licenses. The intent of this dual-licensing
-  structure is to make nanoprintf as consumable as possible in as many
-  environments / countries / companies as possible without any
-  encumberances.
-
-  The text of the two licenses follows below:
-
-  ============================== UNLICENSE ==============================
-
-  This is free and unencumbered software released into the public domain.
-
-  Anyone is free to copy, modify, publish, use, compile, sell, or
-  distribute this software, either in source code form or as a compiled
-  binary, for any purpose, commercial or non-commercial, and by any
-  means.
-
-  In jurisdictions that recognize copyright laws, the author or authors
-  of this software dedicate any and all copyright interest in the
-  software to the public domain. We make this dedication for the benefit
-  of the public at large and to the detriment of our heirs and
-  successors. We intend this dedication to be an overt act of
-  relinquishment in perpetuity of all present and future rights to this
-  software under copyright law.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-  OTHER DEALINGS IN THE SOFTWARE.
-
-  For more information, please refer to <http://unlicense.org>
-
-  ================================ 0BSD =================================
-
-  Copyright (C) 2019- by Charles Nicholson
-  <charles.nicholson+nanoprintf@gmail.com>
-
-  Permission to use, copy, modify, and/or distribute this software for
-  any purpose with or without fee is hereby granted.
-
-  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-void printf(char *format, ...);
\ No newline at end of file
diff --git a/kernel/src/sys/syscall.c b/kernel/src/sys/syscall.c
deleted file mode 100644
index 0a3567c..0000000
--- a/kernel/src/sys/syscall.c
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "sched/sched.h"
-#include <stddef.h>
-#include <stdint.h>
-#include <sys/log.h>
-#include <sys/syscall.h>
-
-static syscall syscall_table[1024];
-
-static int syscall_initialized = 0;
-
-// Stub function for undefined syscalls.
-static uint64_t __syscall_undefined() { return 0; }
-
-void syscall_handle(registers_t *regs) {
-  if (regs->rax > 1024) {
-    log("syscall - syscall_handle was called with rax better than what Soaplin "
-        "supports (1024). did you forget to set rax?\n");
-    return;
-  }
-
-  if (curr_proc == NULL || curr_proc->regs.cs != 0x3B) {
-    log("syscall - syscall_handle was called by the kernel. is this wanted?\n");
-    return;
-  }
-
-  if (syscall_table[regs->rax] == (syscall)__syscall_undefined) {
-    log("syscall - syscall_handle was called with an undefined system call. "
-        "(%d)\n",
-        regs->rax);
-    return;
-  }
-
-  regs->rax = syscall_table[regs->rax](regs->rdi, regs->rsi, regs->rdx,
-                                       regs->rcx, regs->r8, regs->r9);
-  return;
-}
-
-void syscall_register(int id, syscall handler) {
-  if (syscall_table[id] != (syscall)__syscall_undefined) {
-    log("syscall - warning: syscall_register has been called to try replacing "
-        "an existing syscall.\n");
-    return;
-  }
-
-  syscall_table[id] = handler;
-  log("syscall - System call %d has been set to %p\n", id, handler);
-}
-
-extern void syscall_exit(int exit_code);
-
-void syscall_init() {
-  for (int i = 0; i < 1024; i++)
-    syscall_table[i] = (syscall)__syscall_undefined;
-
-  syscall_register(0, (syscall)syscall_exit);
-}
\ No newline at end of file
diff --git a/kernel/src/sys/syscall.h b/kernel/src/sys/syscall.h
deleted file mode 100644
index 5fce348..0000000
--- a/kernel/src/sys/syscall.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "sys/arch/x86_64/idt.h"
-#include <stdint.h>
-
-/// A function that defines a system call.
-/// NOTE: Arguments are defined as uint64_t, but you can simply put your own
-/// type, and then cast your function to syscall.
-typedef uint64_t (*syscall)(uint64_t rdi, uint64_t rsi, uint64_t rdx,
-                            uint64_t rcx, uint64_t r8, uint64_t r9);
-
-/// Registers a system call.
-/// NOTE: an existing system call cannot be replaced by another.
-void syscall_register(int id, syscall handler);
-
-/// Called by the interupt handler, or the "syscall" instruction handler
-void syscall_handle(registers_t *);
-
-/// Initialize the system calls.
-void syscall_init();
\ No newline at end of file
diff --git a/kernel/src/sys/syscalls/syscalls_proc.c b/kernel/src/sys/syscalls/syscalls_proc.c
deleted file mode 100644
index 13bca78..0000000
--- a/kernel/src/sys/syscalls/syscalls_proc.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <sched/sched.h>
-
-int syscall_exit(int exit_code) {
-  // sched_exit(exit_code);
-  return 0;
-}
\ No newline at end of file
diff --git a/kernel/src/sys/uname.h b/kernel/src/sys/uname.h
deleted file mode 100644
index 516d1f4..0000000
--- a/kernel/src/sys/uname.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-typedef struct __uname {
-  char sysname[128];  /* Operating system name */
-  char nodename[128]; /* Name within communications network
-                      to which the node is attached, if any */
-  char release[128];  /* Operating system release */
-  char version[128];  /* Operating system version */
-  char machine[128];  /* Hardware type identifier */
-#ifdef _GNU_SOURCE
-  char domainname[]; /* NIS or YP domain name */
-#endif
-} uname_t;
\ No newline at end of file
diff --git a/limine.conf b/limine.conf
index df98d06..dc83e62 100755
--- a/limine.conf
+++ b/limine.conf
@@ -1,9 +1,6 @@
-timeout: 3
-serial: yes
-verbose: yes
+timeout: 0
+quiet: yes
 
-/SILD - Soaplin 1.0
+/Soaplin
     protocol: limine
-
-    path: boot():/boot/soaplin
-    module_path: boot():/sk-hello.elf
\ No newline at end of file
+    path: boot():/boot/kernel
diff --git a/testing/build.sh b/testing/build.sh
deleted file mode 100755
index ff9f5f5..0000000
--- a/testing/build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-nasm -f elf64 test.asm -o test.o
-ld -T link.ld -nostdlib --no-dynamic-linker --strip-all test.o -o sk-hello.elf
-echo "Test executable has been built successfully."
\ No newline at end of file
diff --git a/testing/link.ld b/testing/link.ld
deleted file mode 100644
index d234f6a..0000000
--- a/testing/link.ld
+++ /dev/null
@@ -1,23 +0,0 @@
-OUTPUT_FORMAT("elf64-x86-64")
-ENTRY(_start)
-
-SECTIONS {
-    . = 0x100000;
-
-    .text : {
-        *(.text)
-    } 
-    
-    .rodata : {
-        *(.rodata)
-    }
-
-    .data : {
-        *(.data)
-    }
-
-    .bss : {
-        *(COMMON)
-        *(.bss)
-    }
-}
\ No newline at end of file
diff --git a/testing/sk-hello.elf b/testing/sk-hello.elf
deleted file mode 100755
index b36d9a6..0000000
Binary files a/testing/sk-hello.elf and /dev/null differ
diff --git a/testing/test.asm b/testing/test.asm
deleted file mode 100644
index 14e2f8a..0000000
--- a/testing/test.asm
+++ /dev/null
@@ -1,9 +0,0 @@
-bits 64
-section .text
-    global _start
-
-_start:
-    mov rax, 10
-.hey:
-    add rax, 1
-    jmp .hey
\ No newline at end of file
diff --git a/testing/test.o b/testing/test.o
deleted file mode 100644
index b3d93e1..0000000
Binary files a/testing/test.o and /dev/null differ
diff --git a/util/get_vaddr_info.py b/util/get_vaddr_info.py
deleted file mode 100755
index 6020da7..0000000
--- a/util/get_vaddr_info.py
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-
-if len(sys.argv) != 2:
-    print(f"Usage: {sys.argv[0]} <virtual_address (hex)>")
-    sys.exit(1)
-
-va = int(sys.argv[1], 16)
-
-def extract_index(name, shift):
-    return (va >> shift) & 0x1FF
-
-print(f"Virtual address : 0x{va:016x}")
-print(f"PML4 index : {extract_index('PML4', 39)}")
-print(f"PDPT index : {extract_index('PDPT', 30)}")
-print(f" PD  index : {extract_index('PD', 21)}")
-print(f" PT  index : {extract_index('PT', 12)}")
-print(f" Offset    : {va & 0xFFF}")