diff --git a/.gitmodules b/.gitmodules
index 9af33af..d00defe 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "boot/platform/uefi/libefi"]
 	path = boot/platform/uefi/libefi
-	url = https://git.piraterna.org/Piraterna/libsefi
+	url = https://github.com/aurixos/efi
diff --git a/Brewfile b/Brewfile
index afff3ac..993024a 100644
--- a/Brewfile
+++ b/Brewfile
@@ -10,7 +10,6 @@ brew "make"
 brew "gptfdisk"
 brew "xorriso"
 brew "qemu"
-brew "ffmpeg"
 brew "llvm"
 brew "lld"
 brew "util-linux" if OS.mac?
diff --git a/Makefile b/Makefile
index 2c740db..eb93a78 100644
--- a/Makefile
+++ b/Makefile
@@ -19,8 +19,6 @@
 
 .DEFAULT_GOAL := all
 
-GITREV := $(shell git rev-parse --short HEAD)
-
 ##
 # Build configuration
 #
@@ -35,7 +33,7 @@ export BUILD_DIR ?= $(ROOT_DIR)/build
 export SYSROOT_DIR ?= $(ROOT_DIR)/sysroot
 export RELEASE_DIR ?= $(ROOT_DIR)/release
 
-export NOUEFI ?= n
+NOUEFI ?= n
 
 ##
 # Image generation and running
@@ -45,19 +43,7 @@ LIVECD := $(RELEASE_DIR)/aurix-$(GITREV)-livecd_$(ARCH)-$(PLATFORM).iso
 LIVEHDD := $(RELEASE_DIR)/aurix-$(GITREV)-livehdd_$(ARCH)-$(PLATFORM).img
 LIVESD := $(RELEASE_DIR)/aurix-$(GITREV)-livesd_$(ARCH)-$(PLATFORM).img
 
-QEMU_FLAGS := -m 2G -smp 4 -rtc base=localtime -serial stdio
-
-# QEMU Audio support
-#QEMU_FLAGS += -audiodev coreaudio,id=coreaudio0 -device ich9-intel-hda -device hda-output,audiodev=coreaudio0
-
-# QEMU Mouse support
-QEMU_FLAGS += -usb -device usb-mouse
-
-# x86_64
-# TODO: Move this elsewhere
-ifeq ($(ARCH),x86_64)
-QEMU_FLAGS += -machine q35
-endif
+QEMU_FLAGS := -m 2G -smp 4 -serial stdio
 
 ##
 # General info
@@ -89,7 +75,16 @@ all: boot kernel
 .PHONY: boot
 boot:
 	@printf ">>> Building bootloader...\n"
-	@$(MAKE) -C boot all
+ifneq (,$(filter $(ARCH),i686 x86_64))
+	@$(MAKE) -C boot PLATFORM=pc-bios
+else
+	@$(MAKE) -C boot
+endif
+ifneq (,$(filter $(ARCH),i686 x86_64 arm32 aarch64))
+ifeq ($(NOUEFI),n)
+	@$(MAKE) -C boot PLATFORM=uefi
+endif
+endif
 
 .PHONY: kernel
 kernel:
@@ -135,21 +130,18 @@ livesd: install
 	@mkdir -p $(RELEASE_DIR)
 	@utils/arch/$(ARCH)/generate-sd.sh $(LIVESD)
 
-# TODO: Maybe don't run with -hda but -drive?
 .PHONY: run
-run: livehdd
+run: livecd
 	@printf ">>> Running QEMU...\n"
-	@qemu-system-$(ARCH) $(QEMU_FLAGS) $(QEMU_MACHINE_FLAGS) -hda $(LIVEHDD)
+	@qemu-system-$(ARCH) $(QEMU_FLAGS) $(QEMU_MACHINE_FLAGS) -cdrom $(LIVECD)
 
-# TODO: Maybe don't run with -hda but -drive?
 .PHONY: run-uefi
-run-uefi: livehdd ovmf
+run-uefi: livecd ovmf
 	@printf ">>> Running QEMU (UEFI)...\n"
-	@qemu-system-$(ARCH) $(QEMU_FLAGS) $(QEMU_MACHINE_FLAGS) -bios ovmf/ovmf-$(ARCH).fd -hda $(LIVEHDD)
+	@qemu-system-$(ARCH) $(QEMU_FLAGS) $(QEMU_MACHINE_FLAGS) -bios ovmf/ovmf-$(ARCH).fd -cdrom $(LIVECD)
 
 .PHONY: clean
 clean:
-	@$(MAKE) -C boot clean
 	@rm -rf $(BUILD_DIR) $(SYSROOT_DIR)
 
 .PHONY: distclean
diff --git a/boot/.gitignore b/boot/.gitignore
deleted file mode 100644
index 64c59cb..0000000
--- a/boot/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-include/sounds
\ No newline at end of file
diff --git a/boot/Makefile b/boot/Makefile
index 79e063c..ea5ec46 100644
--- a/boot/Makefile
+++ b/boot/Makefile
@@ -28,11 +28,9 @@ export BUILD_DIR ?= build
 export SYSROOT_DIR ?= sysroot
 
 export ASFLAGS := $(foreach d, $(DEFINES), -D$d)
-export CFLAGS := $(foreach d, $(DEFINES), -D$d) -Wall -Wextra -Wno-unused-local-typedef -ffreestanding -fno-stack-protector -fno-stack-check -MMD -MP
+export CFLAGS := $(foreach d, $(DEFINES), -D$d) -Wall -Wextra -ffreestanding -fno-stack-protector -fno-stack-check -MMD -MP
 export LDFLAGS := -nostdlib
 
-include arch/$(ARCH)/config.mk
-
 export BOOT_ROOT := $(ROOT_DIR)/boot
 
 ifeq ($(BUILD_TYPE),debug)
@@ -42,37 +40,13 @@ CFLAGS += -O2
 endif
 
 .PHONY: all
-all: sounds
-ifneq (,$(filter $(ARCH),i686 x86_64))
-	@$(MAKE) -C platform/pc-bios all
-else
+all:
 	@$(MAKE) -C platform/$(PLATFORM) all
-endif
-ifneq (,$(filter $(ARCH),i686 x86_64 arm32 aarch64))
-ifeq ($(NOUEFI),n)
-	@$(MAKE) -C platform/uefi all
-#	@$(MAKE) -C drivers all
-endif
-endif
-
-.PHONY: sounds
-sounds:
-	@mkdir -p $(BUILD_DIR)/boot/sounds
-	@mkdir -p $(BOOT_ROOT)/include/sounds
-	@for f in $(BOOT_ROOT)/sound/*.mp3; do \
-		file=$$(basename $$f ".$${f##*.}") ; \
-		printf "  GEN\t$$file.h\n" ; \
-    	ffmpeg -i "$$f" -acodec pcm_s16le -f s16le -ac 2 "$(BUILD_DIR)/boot/sounds/$$file.raw" -y 2>/dev/null ; \
-		python3 $(ROOT_DIR)/utils/bin_to_header.py "$(BUILD_DIR)/boot/sounds/$$file.raw" "$(BOOT_ROOT)/include/sounds/$$file.h" $$file ; \
-	done
 
 .PHONY: install
 install:
 	@$(MAKE) -C platform/$(PLATFORM) install
-#	@$(MAKE) -C drivers install
-	@mkdir -p $(SYSROOT_DIR)/AxBoot
-	@cp -r base/* $(SYSROOT_DIR)/AxBoot
 
 .PHONY: clean
 clean:
-	@rm -rf $(BOOT_ROOT)/include/sounds
+	@$(MAKE) -C platform/$(PLATFORM) clean
diff --git a/boot/arch/aarch64/config.mk b/boot/arch/aarch64/config.mk
deleted file mode 100644
index e69de29..0000000
diff --git a/boot/arch/i686/config.mk b/boot/arch/i686/config.mk
deleted file mode 100644
index 65b82a4..0000000
--- a/boot/arch/i686/config.mk
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS += -DARCH_ACPI_AVAILABLE -DARCH_SMBIOS_AVAILABLE
\ No newline at end of file
diff --git a/boot/arch/x86_64/common/mm/paging.c b/boot/arch/x86_64/common/mm/paging.c
index 827201e..40826fd 100644
--- a/boot/arch/x86_64/common/mm/paging.c
+++ b/boot/arch/x86_64/common/mm/paging.c
@@ -58,6 +58,10 @@ static void _map(pagetable *pm, uintptr_t virt, uintptr_t phys, uint64_t flags)
     }
 
     pagetable *pml1_table = (pagetable *)(pml2_table->entries[pml2_idx] & 0x000FFFFFFFFFF000);
+    if ((pml1_table->entries[pml1_idx] & 1)) {
+        // debug("_map(): Remapping present page\n");
+    }
+
     pml1_table->entries[pml1_idx] = (phys & 0x000FFFFFFFFFF000) | flags;
 }
 
diff --git a/boot/arch/x86_64/common/proto/aurix/handoff.c b/boot/arch/x86_64/common/proto/aurix/handoff.c
deleted file mode 100644
index f23645e..0000000
--- a/boot/arch/x86_64/common/proto/aurix/handoff.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  handoff.c                                                       */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#include <arch/cpu/gdt.h>
-#include <arch/cpu/idt.h>
-#include <proto/aurix.h>
-#include <mm/vmm.h>
-#include <print.h>
-#include <stdint.h>
-
-struct gdt {
-	struct gdt_descriptor null;
-	struct gdt_descriptor kcode;
-	struct gdt_descriptor kdata;
-	struct gdt_descriptor ucode;
-	struct gdt_descriptor udata;
-	struct tss_descriptor tss;
-};
-
-void aurix_arch_handoff(void *kernel_entry, pagetable *pm, void *stack, uint32_t stack_size, struct aurix_parameters *parameters)
-{
-	struct tss tss = {
-		.iomap_base = sizeof(struct tss),
-	};
-
-	struct gdt gdt = {
-		.tss = {
-			.gdt = {
-				.base_low = ((uintptr_t)&tss) & 0xFFFF,
-				.base_mid = (((uintptr_t)&tss) >> 16) & 0xFF,
-				.base_high = (((uintptr_t)&tss) >> 24) & 0xFF,
-				.access = 0b10001001
-			},
-			.base_high = (((uintptr_t)&tss) >> 32) & 0xFFFF
-		},
-	};
-
-	struct gdtr gdtr = {
-		.base = (uint64_t)&gdt,
-		.limit = sizeof(gdt) - 1
-	};
-
-	gdt_set_entry(&gdt.null, 0, 0, 0, 0);
-	gdt_set_entry(&gdt.kcode, 0, 0, 0x9a, 0xaf);
-	gdt_set_entry(&gdt.kdata, 0, 0, 0x92, 0xcf);
-	gdt_set_entry(&gdt.ucode, 0, 0, 0xfa, 0xaf);
-	gdt_set_entry(&gdt.udata, 0, 0, 0xf2, 0xcf);
-
-	struct idtr idtr = {
-		.base = (uint64_t)0,
-		.limit = 0
-	};
-
-	__asm__ volatile(
-					"cli\n"
-					//"lgdt %[gdtr]\n"
-					//"ltr %[tss]\n"
-					//"pushq $0x08\n"
-					//"lea 1f(%%rip), %%rax\n"
-					//"pushq %%rax\n"
-					//"lretq\n"
-					//"1:\n"
-					//"movq $0x10, %%rax\n"
-					//"movq %%rax, %%ds\n"
-					//"movq %%rax, %%es\n"
-					//"movq %%rax, %%ss\n"
-					//"movq %%rax, %%fs\n"
-					//"movq %%rax, %%gs\n"
-
-					//"lidt %[idt]\n"
-
-					"movq %[pml4], %%cr3\n"
-					"movq %[stack], %%rsp\n"
-					"movq %[params], %%rdi\n"
-					"movq %[entry], %%rsi\n"
-
-					// rsi = kernel entry point addr
-					// rdi = kernel parameters
-					"xor %%rax, %%rax\n"
-					"xor %%rbx, %%rbx\n"
-					"xor %%rcx, %%rcx\n"
-					"xor %%rdx, %%rdx\n"
-					//"xor %%rdi, %%rdi\n"
-					//"xor %%rsi, %%rsi\n"
-					"xor %%r8, %%r8\n"
-					"xor %%r9, %%r9\n"
-					"xor %%r10, %%r10\n"
-					"xor %%r11, %%r11\n"
-					"xor %%r12, %%r12\n"
-					"xor %%r13, %%r13\n"
-					"xor %%r14, %%r14\n"
-					"xor %%r15, %%r15\n"
-
-					"callq *%%rsi\n"
-					:: [gdtr]"g"(gdtr), [tss]"r"((uint16_t)__builtin_offsetof(struct gdt, tss)),
-						[idt]"g"(idtr),
-						[pml4]"r"(pm), [stack]"r"(stack + stack_size),
-						[entry]"r"(kernel_entry), [params]"d"(parameters) : "rax", "memory");
-}
\ No newline at end of file
diff --git a/boot/arch/x86_64/common/proto/aurix_handoff.S b/boot/arch/x86_64/common/proto/aurix_handoff.S
new file mode 100644
index 0000000..7c8f896
--- /dev/null
+++ b/boot/arch/x86_64/common/proto/aurix_handoff.S
@@ -0,0 +1,24 @@
+.globl _aurix_handoff_start
+.globl _aurix_handoff_end
+.globl aurix_handoff
+
+_aurix_handoff_start:
+aurix_handoff:
+	cli
+	movq %rsi, %rsp
+.section _aurix_handoff
+	movq %rdi, %cr3
+	xor %rax, %rax
+	xor %rbx, %rbx
+	xor %rcx, %rcx
+	xor %rdi, %rdi
+	xor %r8, %r8
+	xor %r9, %r9
+	xor %r10, %r10
+	xor %r11, %r11
+	xor %r12, %r12
+	xor %r13, %r13
+	xor %r14, %r14
+	xor %r15, %r15
+	callq *%rdx
+_aurix_handoff_end:
\ No newline at end of file
diff --git a/boot/arch/x86_64/common/uart/uart.c b/boot/arch/x86_64/common/uart/uart.c
deleted file mode 100644
index 7403a78..0000000
--- a/boot/arch/x86_64/common/uart/uart.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  uart.c                                                          */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#include <stdint.h>
-
-#include <arch/cpu/cpu.h>
-#include <uart/uart.h>
-
-#define COM1 0x3f8
-
-void uart_init(uint32_t baud_rate)
-{
-	uint8_t divisor = 115200 / baud_rate;
-
-	outb(COM1 + 1, 0x00);
-	outb(COM1 + 3, 0x80);
-	outb(COM1 + 0, divisor & 0xFF);
-	outb(COM1 + 1, (divisor >> 8) & 0xFF);
-	outb(COM1 + 3, 0x03);
-	outb(COM1 + 2, 0xC7);
-	outb(COM1 + 4, 0x0B);
-	outb(COM1 + 4, 0x0F);
-}
-
-void uart_send(char c)
-{
-	while ((inb(COM1 + 5) & 0x20) == 0);
-	outb(COM1, c);
-}
-
-void uart_sendstr(char *str)
-{
-	while (*str != '\0') {
-		if (*str == '\n') {
-			uart_send('\r');
-		}
-		uart_send(*str);
-		str++;
-	}
-}
\ No newline at end of file
diff --git a/boot/arch/x86_64/config.mk b/boot/arch/x86_64/config.mk
deleted file mode 100644
index 65b82a4..0000000
--- a/boot/arch/x86_64/config.mk
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS += -DARCH_ACPI_AVAILABLE -DARCH_SMBIOS_AVAILABLE
\ No newline at end of file
diff --git a/boot/base/axboot.cfg b/boot/base/axboot.cfg
index 0de7fe4..ccfec46 100644
--- a/boot/base/axboot.cfg
+++ b/boot/base/axboot.cfg
@@ -1,13 +1,12 @@
-;; please leave this here, the parser breaks without it
+; This is a comment
 
-default = 0
-timeout = 30
-ui = text
+entry "AurixOS" {
+    PROTOCOL="aurix"
+    IMAGE_PATH="boot:///System/axkrnl.sys"
+}
 
-[AurixOS]
-protocol = aurix
-image = boot:///System/axkrnl.sys
-
-[Windows 10]
-protocol = efi-chainload
-image = boot:///EFI/Microsoft/bootmgfw.efi
\ No newline at end of file
+;; UEFI only
+entry "Windows" {
+    PROTOCOL="chainload"
+    IMAGE_PATH="boot:///EFI/Microsoft/bootmgfw.efi"
+}
diff --git a/boot/base/fonts/u_vga16/u_vga16.sfn b/boot/base/fonts/u_vga16/u_vga16.sfn
deleted file mode 100644
index 5d5a4d0..0000000
Binary files a/boot/base/fonts/u_vga16/u_vga16.sfn and /dev/null differ
diff --git a/boot/base/fonts/vera/Vera.sfn b/boot/base/fonts/vera/Vera.sfn
deleted file mode 100644
index 4c4b0f3..0000000
Binary files a/boot/base/fonts/vera/Vera.sfn and /dev/null differ
diff --git a/boot/common/config/config.c b/boot/common/config/config.c
index 57352e0..1fef728 100644
--- a/boot/common/config/config.c
+++ b/boot/common/config/config.c
@@ -17,11 +17,8 @@
 /* SOFTWARE.                                                                     */
 /*********************************************************************************/
 
-#include <config/config.h>
 #include <lib/string.h>
-#include <loader/loader.h>
 #include <mm/mman.h>
-#include <time/dt.h>
 #include <vfs/vfs.h>
 #include <print.h>
 #include <axboot.h>
@@ -29,66 +26,20 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#define DEFAULT_ENTRY 0
-// default timeout of 0 disables the UI entirely, which is essentialy what *should* happen now since the UI
-// is... in a catastrophic state. Just remember to set this back to 30 once the UI is ready
-#define DEFAULT_TIMEOUT 0
-// #define DEFAULT_TIMEOUT 30
-
 char *config_paths[] = {
-	"\\AxBoot\\axboot.cfg",
 	"\\axboot.cfg",
+	"\\System\\axboot.cfg",
 	"\\EFI\\axboot.cfg",
 	"\\EFI\\BOOT\\axboot.cfg",
 };
 
-struct axboot_cfg cfg = {
-	.default_entry = DEFAULT_ENTRY,
-	.timeout = DEFAULT_TIMEOUT,
-	.ui_mode = UI_TEXT,
-
-	//.entry_count = 0,
-	.entry_count = 2,
-	.bootlog_filename = NULL
-};
-
-struct axboot_entry entries[2] = {
-	{
-		.name = "AurixOS",
-		.description = "Boot the Aurix Operating System",
-		.image_path = "\\System\\axkrnl",
-		.protocol = PROTO_AURIX
-	},
-	{
-		.name = "Windows 10",
-		.description = "",
-		.image_path = "\\EFI\\Microsoft\\bootmgfw.efi",
-		.protocol = PROTO_CHAINLOAD
-	}
-};
-
-
 void config_init(void)
 {
-	// create a filename for boot log
-	// format: \AXBOOT_LOG-YY-MM-DD_HHMMSS.txt
-	char bootlog_fn[33];
-	struct datetime dt;
-	get_datetime(&dt);
-
-	snprintf(bootlog_fn, 33, "\\AXBOOT_LOG-%u-%u-%u_%u%u%u.txt", dt.year, dt.month, dt.day, dt.h, dt.m, dt.s);
-	cfg.bootlog_filename = (char *)mem_alloc(ARRAY_LENGTH(bootlog_fn));
-	if (!cfg.bootlog_filename) {
-		debug("Error!\n");
-	} else {
-		strncpy(cfg.bootlog_filename, (char *)&bootlog_fn, 33);
-	}
-
-	char *config_buf = NULL;
+	char *config_buf;
 	uint8_t open = 0;
 	
 	for (size_t i = 0; i < ARRAY_LENGTH(config_paths); i++) {
-		vfs_read(config_paths[i], &config_buf);
+		vfs_read("\\System\\axkrnl", &config_buf);
 		if (config_buf != NULL) {
 			open = 1;
 			break;
@@ -96,35 +47,12 @@ void config_init(void)
 	}
 
 	if (open == 0) {
-		debug("config_init(): Couldn't open a configuration file! Entering console...\n");
+		debug("Couldn't open a configuration file! Entering console...\n");
 		//console();
 		while (1);
 	}
 
+	// TODO: parse configuration file
+
 	mem_free(config_buf);
-}
-
-int config_get_timeout()
-{
-	return cfg.timeout;
-}
-
-int config_get_default()
-{
-	return cfg.default_entry;
-}
-
-int config_get_entry_count()
-{
-	return cfg.entry_count;
-}
-
-struct axboot_entry *config_get_entries()
-{
-	return entries;
-}
-
-int config_get_ui_mode()
-{
-	return cfg.ui_mode;
 }
\ No newline at end of file
diff --git a/boot/common/data/list.c b/boot/common/data/list.c
deleted file mode 100644
index 9fa15fd..0000000
--- a/boot/common/data/list.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  list.c                                                          */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#include <data/list.h>
-#include <mm/mman.h>
-#include <print.h>
-
-#include <stdint.h>
-
-List *list_new()
-{
-	List *list = (List *)mem_alloc(sizeof(List));
-	if (!list) {
-		debug("list_new(): Failed to allocate memory for new list!\n");
-		return NULL;
-	}
-
-	list->count = 0;
-	list->root = (ListNode *)0;
-	
-	return list;
-}
-
-ListNode *listnode_new(void *data)
-{
-	ListNode *ln = (ListNode *)mem_alloc(sizeof(ListNode));
-	if (!ln) {
-		debug("listnode_new(): Failed to allocate memory for new list node!\n");
-		return NULL;
-	}
-
-	ln->prev = (ListNode *)0;
-	ln->next = (ListNode *)0;
-	ln->data = data;
-	
-	return ln;
-}
-
-int list_add(List *list, void *data)
-{
-	ListNode *node = listnode_new(data);
-	if (!node) {
-		return false;
-	}
-
-	if (!list->root) {
-		list->root = node;
-	} else {
-		ListNode *cur = list->root;
-
-		while (cur->next) {
-			cur = cur->next;
-		}
-
-		cur->next = node;
-		node->prev = cur;
-	}
-
-	list->count++;
-	return true;
-}
-
-void *list_remove_at(List *list, uint32_t idx)
-{
-	void *data;
-
-	if (!list || list->count == 0 || idx >= list->count) {
-		return NULL;
-	}
-
-	ListNode *cur = list->root;
-
-	for (uint32_t i = 0; (i < idx) && cur; i++) {
-		cur = cur->next;
-	}
-
-	if (!cur) {
-		return NULL;
-	}
-
-	data = cur->data;
-
-	if (cur->prev) {
-		cur->prev->next = cur->next;
-	}
-
-	if (cur->next) {
-		cur->next->prev = cur->prev;
-	}
-
-	if (idx == 0) {
-		list->root = cur->next;
-	}
-
-	mem_free(cur);
-
-	list->count--;
-	return data;
-}
-
-void *list_get_at(List *list, uint32_t idx)
-{
-	if (!list || list->count == 0 | idx >= list->count) {
-		return NULL;
-	}
-
-	ListNode *cur = list->root;
-
-	for (uint32_t i = 0; (i < idx) && cur; i++) {
-		cur = cur->next;
-	}
-
-	return cur ? cur->data : NULL;
-}
\ No newline at end of file
diff --git a/boot/common/fs/uefi_sfs.c b/boot/common/fs/uefi_sfs.c
index e1e5355..bd15e2e 100644
--- a/boot/common/fs/uefi_sfs.c
+++ b/boot/common/fs/uefi_sfs.c
@@ -80,7 +80,7 @@ struct vfs_drive *sfs_init(char *mountpoint)
 
 	fs->fsdata = fsdata;
 	fs->read = sfs_read;
-	fs->write = sfs_write;
+	fs->write = NULL; // sfs_write()
 
 	struct vfs_drive *drive = (struct vfs_drive *)mem_alloc(sizeof(struct vfs_drive));
 	if (drive == NULL) {
@@ -121,7 +121,7 @@ size_t sfs_read(char *filename, char **buffer, struct vfs_drive *dev, void *fsda
 	wfilename[n] = L'\0';
 
 	/* open the file */
-	status = volume->Open(volume, &file, wfilename, EFI_FILE_MODE_READ, 0);
+	status = volume->Open(volume, &file, wfilename, EFI_FILE_MODE_READ, EFI_FILE_READ_ONLY | EFI_FILE_HIDDEN | EFI_FILE_SYSTEM);
 	if (EFI_ERROR(status)) {
 		debug("sfs_read(): Failed to open file '%s': %s (%lx)\n", filename, efi_status_to_str(status), status);
 		mem_free(wfilename);
@@ -159,49 +159,4 @@ size_t sfs_read(char *filename, char **buffer, struct vfs_drive *dev, void *fsda
 	return len;
 }
 
-uint8_t sfs_write(char *filename, char *buffer, size_t size, struct vfs_drive *dev, void *fsdata)
-{
-	(void)dev;
-
-	struct sfs_fsdata *data = (struct sfs_fsdata *)fsdata;
-	EFI_FILE_PROTOCOL *volume = data->volume;
-	EFI_FILE_PROTOCOL *file;
-	CHAR16 *wfilename;
-	EFI_STATUS status = EFI_SUCCESS;
-	size_t len = 0;
-
-	wfilename = (CHAR16 *)mem_alloc(strlen(filename) * sizeof(CHAR16));
-	if (!wfilename) {
-		debug("sfs_write(): Failed to allocate memory for wide strings!\n");
-		return 0;
-	}
-
-	size_t n = mbstowcs(wfilename, (const char **)&filename, strlen(filename));
-	wfilename[n] = L'\0';
-
-	/* open the file */
-	status = volume->Open(volume, &file, wfilename, EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE | EFI_FILE_MODE_CREATE, EFI_FILE_SYSTEM);
-	if (EFI_ERROR(status)) {
-		debug("sfs_write(): Failed to open file '%s': %s (%lx)\n", filename, efi_status_to_str(status), status);
-		mem_free(wfilename);
-		return 0;
-	}
-
-	mem_free(wfilename);
-
-	// set position to the end of the file
-	file->SetPosition(file, 0xffffffffffffffff);
-
-	status = file->Write(file, &size, buffer);
-	if (EFI_ERROR(status)) {
-		debug("sfs_write(): Failed to read file '%s': %s (%lx)\n", filename, efi_status_to_str(status), status);
-		return 0;
-	}
-
-	/* close the file */
-	file->Close(file);
-
-	return len;
-}
-
 #endif
\ No newline at end of file
diff --git a/boot/common/i18n/cs_CZ.c b/boot/common/i18n/cs_CZ.c
deleted file mode 100644
index 754544d..0000000
--- a/boot/common/i18n/cs_CZ.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  cs_CZ.c                                                         */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#include <i18n.h>
-
-struct language i18n_csCZ = {
-	.shutdown = "Vypnout",
-	.reboot = "Restartovat",
-	.reboot_to_firmware = "Přejít do nastavení firmwaru",
-	.resolution = "Rozlišení",
-
-	.language = "Jazyk"
-};
diff --git a/boot/common/i18n/en_US.c b/boot/common/i18n/en_US.c
deleted file mode 100644
index 629e26b..0000000
--- a/boot/common/i18n/en_US.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  en_US.c                                                         */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#include <i18n.h>
-
-struct language i18n_enUS = {
-	.shutdown = "Shutdown",
-	.reboot = "Reboot",
-	.reboot_to_firmware = "Reboot to Firmware",
-	.resolution = "Resolution",
-
-	.language = "Language"
-};
diff --git a/boot/common/i18n/i18n.c b/boot/common/i18n/i18n.c
deleted file mode 100644
index c2860a1..0000000
--- a/boot/common/i18n/i18n.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  i18n.c                                                          */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#include <i18n.h>
-
-extern struct language i18n_csCZ;
-extern struct language i18n_enUS;
-
-struct language_selection i18n_languages[] = {
-	{
-		"Čeština",
-		"cs_CZ",
-		&i18n_csCZ
-	},
-	{
-		"English",
-		"en_US",
-		&i18n_enUS
-	}
-};
-
-struct language_selection *i18n_curlang = &i18n_languages[1]; // english
\ No newline at end of file
diff --git a/boot/common/init.c b/boot/common/init.c
index 4385ac5..6ef4552 100644
--- a/boot/common/init.c
+++ b/boot/common/init.c
@@ -17,50 +17,21 @@
 /* SOFTWARE.                                                                     */
 /*********************************************************************************/
 
-#include <config/config.h>
-#include <loader/loader.h>
-#include <proto/aurix.h>
-#include <uart/uart.h>
 #include <vfs/vfs.h>
-#include <ui/ui.h>
-#include <axboot.h>
+#include <mm/mman.h>
+#include <mm/vmm.h>
+#include <proto/aurix.h>
 #include <print.h>
 
 void axboot_init()
 {
-	uart_init(115200);
-
 	if (!vfs_init("\\")) {
-		log("axboot_init(): Failed to mount boot drive! Halting...\n");
+		debug("axboot_init(): Failed to mount boot drive! Halting...\n");
 		// TODO: Halt
 		while (1);
 	}
 
-	config_init();
+	aurix_load("\\System\\axkrnl");
 
-#if defined(__aarch64__) && !defined(AXBOOT_UEFI)
-	struct axboot_entry rpi_kernel = {
-		.name = "AurixOS for Raspberry Pi",
-		.image_path = "\\System\\axkrnl",
-		.protocol = PROTO_AURIX
-	};
-	loader_load(&rpi_kernel);
-	UNREACHABLE();
-#endif
-
-#ifdef AXBOOT_UEFI
-#include <driver.h>
-	load_drivers();
-#endif
-
-	// boot straight away
-	if (config_get_timeout() < 1) {
-		struct axboot_entry *entries = config_get_entries();
-		loader_load(&(entries[config_get_default()]));
-	}
-
-	ui_init();
-
-	log("axboot_init(): Returned from main menu, something went wrong. Halting!");
-	UNREACHABLE();
+	while (1);
 }
\ No newline at end of file
diff --git a/boot/common/lib/string.c b/boot/common/lib/string.c
index 816bbe8..533806f 100644
--- a/boot/common/lib/string.c
+++ b/boot/common/lib/string.c
@@ -143,38 +143,6 @@ char *strcpy(char *dest, const char *src)
 	return pdest;
 }
 
-char *strncpy(char *dest, const char *src, size_t n)
-{
-	if (dest == NULL || src == NULL) {
-		return NULL;
-	}
-
-	char *pdest = dest;
-
-	while (*src != '\0' || n--) {
-		*pdest++ = *src++;
-	}
-
-	*pdest = '\0';
-	return dest;
-}
-
-char *strncat(char *dest, const char *src, size_t n)
-{
-	if (dest == 0 || src == 0) {
-		return NULL;
-	}
-
-	size_t i = strlen(dest);
-	size_t a = 0;
-	
-	while (a < n && src[a] != '\0') {
-		dest[i++] = src[a++];
-	}
-	dest[i] = '\0';
-	return dest;
-}
-
 // TODO: Get rid of this function
 char *strdup(const char *s)
 {
diff --git a/boot/common/loader/elf.c b/boot/common/loader/elf.c
index 9ae909b..e79601f 100644
--- a/boot/common/loader/elf.c
+++ b/boot/common/loader/elf.c
@@ -28,15 +28,14 @@
 /* https://github.com/KevinAlavik/nekonix/blob/main/kernel/src/proc/elf.c */
 /* Thanks, Kevin <3 */
 
-uintptr_t elf32_load(char *data, uintptr_t *addr, pagetable *pagemap)
+uintptr_t elf32_load(char *data, pagetable *pagemap)
 {
     (void)data;
-    (void)addr;
     (void)pagemap;
     return 0;
 }
 
-uintptr_t elf64_load(char *data, uintptr_t *addr, pagetable *pagemap)
+uintptr_t elf64_load(char *data, pagetable *pagemap)
 {
     struct elf_header *header = (struct elf_header *)data;
     struct elf_program_header *ph = (struct elf_program_header *)((uint8_t *)data + header->e_phoff);
@@ -66,13 +65,9 @@ uintptr_t elf64_load(char *data, uintptr_t *addr, pagetable *pagemap)
     
         uint64_t phys = ((uint64_t)mem_alloc(ph[i].p_memsz + ph[i].p_vaddr - aligned_vaddr + 4096) + 4096) & ~0xFFF;
         if (!phys) {
-            log("elf64_load(): Out of memory\n");
+            debug("elf64_load(): Out of memory\n");
             return 0;
         }
-
-        if (addr != NULL && *addr == 0) {
-            *addr = phys;
-        }
         
         debug("elf64_load(): phys=0x%llx, virt=0x%llx, size=%lu\n", phys, ph[i].p_vaddr, ph[i].p_filesz);
 
@@ -80,32 +75,32 @@ uintptr_t elf64_load(char *data, uintptr_t *addr, pagetable *pagemap)
         memcpy((void*)(phys + ph[i].p_vaddr - aligned_vaddr), data + ph[i].p_offset, ph[i].p_filesz);
     }
 
-    log("elf64_load(): ELF loaded successfully, entry: 0x%llx\n", header->e_entry);
+    debug("elf64_load(): ELF loaded successfully, entry: 0x%llx\n", header->e_entry);
     return (uintptr_t)header->e_entry;
 }
 
-uintptr_t elf_load(char *data, uintptr_t *addr, pagetable *pagemap)
+uintptr_t elf_load(char *data, pagetable *pagemap)
 {
     struct elf_header *header = (struct elf_header *)data;
 
     if (header->e_magic != ELF_MAGIC) {
-        log("elf_load(): Invalid ELF magic: 0x%x", header->e_magic);
+        debug("Invalid ELF magic: 0x%x", header->e_magic);
         return 0;
     }
 
     if (header->e_class != 2) {
-        log("elf_load(): Unsupported ELF class: %u", header->e_class);
+        debug("Unsupported ELF class: %u", header->e_class);
         return 0;
     }
 
     if (header->e_machine == 20 ||
         header->e_machine == 3 ||
         header->e_machine == 40) {
-        return elf32_load(data, addr, pagemap);
+        return elf32_load(data, pagemap);
     } else if (header->e_machine == 62) {
-        return elf64_load(data, addr, pagemap);
+        return elf64_load(data, pagemap);
     }
 
-    log("elf_load(): Unsupported ELF machine: %u", header->e_machine);
+    debug("Unsupported ELF machine: %u", header->e_machine);
     return 0;
 }
diff --git a/boot/common/loader/loader.c b/boot/common/loader/loader.c
deleted file mode 100644
index f91890d..0000000
--- a/boot/common/loader/loader.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  loader.c                                                        */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#include <config/config.h>
-#include <loader/loader.h>
-#include <lib/string.h>
-#include <proto/aurix.h>
-#include <print.h>
-#include <axboot.h>
-
-int proto_str_to_int(char *proto)
-{
-	if (strcmp(proto, "aurix") == 0) {
-		return PROTO_AURIX;
-	}
-
-#ifdef AXBOOT_UEFI
-	if (strcmp(proto, "efi-chainload") == 0) {
-		return PROTO_CHAINLOAD;	
-	}
-#endif
-	
-	return PROTO_UNSUPPORTED;
-}
-
-void loader_load(struct axboot_entry *entry)
-{
-	log("loader_load(): Booting \"%s\"...\n", entry->name);
-
-	switch (entry->protocol) {
-		case PROTO_AURIX: {
-			aurix_load(entry->image_path);
-			break;
-		}
-		default: {
-			log("loader_load(): Entry doesn't have a supported protocol!\n");
-			break;
-		}
-	}
-
-	UNREACHABLE();
-}
\ No newline at end of file
diff --git a/boot/common/mm/mman.c b/boot/common/mm/mman.c
index df4dd08..ea4490a 100644
--- a/boot/common/mm/mman.c
+++ b/boot/common/mm/mman.c
@@ -42,7 +42,7 @@ int find_alloc(void *addr)
 int add_alloc(void *addr, size_t size)
 {
 	for (int i = 0; i < MAX_ALLOCATIONS; i++) {
-		if (allocation_list[i].addr == NULL) {
+		if (allocation_list[i].addr == 0) {
 			allocation_list[i].addr = addr;
 			allocation_list[i].size = size;
 			return 1;
@@ -112,6 +112,7 @@ void *mem_alloc(size_t n)
 	}
 
 	add_alloc(alloc, n);
+
 	return alloc;
 }
 
@@ -121,11 +122,12 @@ int mem_allocat(void *addr, size_t npages)
 
 	status = gBootServices->AllocatePages(AllocateAddress, EfiLoaderData, (EFI_UINTN)npages, addr);
 	if (EFI_ERROR(status)) {
-		debug("mem_allocat(): Couldn't allocate %u pages at 0x%lx: %s (%lx)\n", npages, addr, efi_status_to_str(status), status);
+		debug("mem_allocat(): Couldn't allocate %u bytes at 0x%lx: %s (%lx)\n", npages, addr, efi_status_to_str(status), status);
 		return 0;
 	}
 
 	add_alloc(addr, npages * PAGE_SIZE);
+
 	return 1;
 }
 
@@ -135,9 +137,9 @@ void *mem_realloc(void *addr, size_t n)
 	void *new = NULL;
 	
 	int i = find_alloc(addr);
-	if (i == -1 || addr == NULL) {
-		debug("mem_realloc(): Couldn't find allocation for 0x%lx, allocating new memory.\n");
-		return mem_alloc(n);
+	if (i == -1) {
+		debug("mem_realloc(): Couldn't find allocation for 0x%lx.\n");
+		return NULL;
 	}
 
 	old_size = allocation_list[i].size;
@@ -149,6 +151,7 @@ void *mem_realloc(void *addr, size_t n)
 
 	memcpy(new, addr, old_size);
 	mem_free(addr);
+
 	return new;
 }
 
@@ -167,7 +170,6 @@ void mem_free(void *addr)
 	}
 
 	remove_alloc(addr);
-	debug("mem_free(): Freed 0x%llx\n", addr);
 }
 
 #endif
diff --git a/boot/common/print.c b/boot/common/print.c
index 241a43b..93553c7 100644
--- a/boot/common/print.c
+++ b/boot/common/print.c
@@ -19,16 +19,13 @@
 
 #define NANOPRINTF_IMPLEMENTATION
 #define NANOPRINTF_USE_FIELD_WIDTH_FORMAT_SPECIFIERS 1
-#define NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS 1
+#define NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS 0
 #define NANOPRINTF_USE_FLOAT_FORMAT_SPECIFIERS 0
 #define NANOPRINTF_USE_LARGE_FORMAT_SPECIFIERS 1
 #define NANOPRINTF_USE_BINARY_FORMAT_SPECIFIERS 0
 #define NANOPRINTF_USE_WRITEBACK_FORMAT_SPECIFIERS 0
 #include <nanoprintf.h>
 
-#include <config/config.h>
-#include <uart/uart.h>
-#include <vfs/vfs.h>
 #include <print.h>
 
 #include <stddef.h>
@@ -36,75 +33,43 @@
 #include <stdarg.h>
 #include <stdbool.h>
 
-#include <efi.h>
-#include <efilib.h>
-#include <mm/mman.h>
-#include <lib/string.h>
-
 int32_t _fltused = 0;
 int32_t __eqdf2 = 0;
 int32_t __ltdf2 = 0;
 
-extern struct axboot_cfg cfg;
-
-CHAR16 wstr[1024];
-
 void log(const char *fmt, ...)
 {
 	va_list args;
-	char buf[1024];
-	size_t size = 0;
+	char buf[4096];
 
 	va_start(args, fmt);
-	size = npf_vsnprintf(buf, sizeof(buf), fmt, args);
+	npf_vsnprintf(buf, sizeof(buf), fmt, args);
 	va_end(args);
 
-	uart_sendstr(buf);
-
-	if (cfg.bootlog_filename != NULL) {
-		vfs_write(cfg.bootlog_filename, (char *)&buf, size);
-	}
-
+// TODO: Get rid of this
 #ifdef AXBOOT_UEFI
-	char *bufp = &buf;
-	size_t n = mbstowcs((wchar_t *)&wstr, (const char **)&bufp, 1024);
-	wstr[n] = L'\r';
-	wstr[n+1] = L'\0';
-	gSystemTable->ConOut->OutputString(gSystemTable->ConOut, wstr);
-	gBootServices->Stall(100000);
+	printstr(buf);
 #endif
 }
 
 void debug(const char *fmt, ...)
 {
 	va_list args;
-	char buf[1024];
+	char buf[4096];
 
 	va_start(args, fmt);
 	npf_vsnprintf(buf, sizeof(buf), fmt, args);
 	va_end(args);
 
 #ifdef AXBOOT_UEFI
-	char *bufp = &buf;
-	size_t n = mbstowcs((wchar_t *)&wstr, (const char **)&bufp, 1024);
-	wstr[n] = L'\r';
-	wstr[n+1] = L'\0';
-	gSystemTable->ConOut->OutputString(gSystemTable->ConOut, wstr);
-	gBootServices->Stall(100000);
+	printstr(buf);
 #endif
-	uart_sendstr(buf);
 }
 
 void snprintf(char *buf, size_t size, const char *fmt, ...)
 {
 	va_list args;
-
 	va_start(args, fmt);
 	npf_vsnprintf(buf, size, fmt, args);
 	va_end(args);
-}
-
-void vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
-{
-	npf_vsnprintf(buf, size, fmt, args);
-}
+}
\ No newline at end of file
diff --git a/boot/common/proto/aurix.c b/boot/common/proto/aurix.c
index fdd18e3..5c79856 100644
--- a/boot/common/proto/aurix.c
+++ b/boot/common/proto/aurix.c
@@ -17,190 +17,65 @@
 /* SOFTWARE.                                                                     */
 /*********************************************************************************/
 
-#include <acpi/acpi.h>
 #include <proto/aurix.h>
 #include <loader/elf.h>
 #include <mm/mman.h>
 #include <mm/memmap.h>
 #include <mm/vmm.h>
-#include <lib/string.h>
-#include <ui/framebuffer.h>
 #include <vfs/vfs.h>
 #include <print.h>
 #include <axboot.h>
+#include <efi.h>
+#include <efilib.h>
 
-#include <stdint.h>
-#include <stdbool.h>
-
-#define AURIX_STACK_SIZE 16*1024
-
-bool aurix_get_memmap(struct aurix_parameters *params, axboot_memmap *mmap, uint32_t mmap_entries, pagetable *pm)
-{
-	if (params == NULL || mmap == NULL || pm == NULL ||  mmap_entries == 0) {
-		log("aurix_get_memmap(): Invalid parameter!\n");
-		return false;
-	}
-
-	// UEFI returns an unnecessarily large memory map with regions of the same type
-	// being split into multiple entries (probably due to memory attributes, which we do not care about).
-	for (uint32_t i = 0; i < mmap_entries; i++) {
-		if (i == mmap_entries - 1) {
-			break;
-		}
-		if (mmap[i].base + mmap[i].size >= mmap[i+1].base && mmap[i].type == mmap[i+1].type) {
-			mmap[i].size += mmap[i+1].size;
-			for (uint32_t j = i+1; j < mmap_entries; j++) {
-				mmap[j].base = mmap[j+1].base;
-				mmap[j].size = mmap[j+1].size;
-				mmap[j].type = mmap[j+1].type;
-			}
-			mmap_entries--;
-			i--;
-		}
-	}
-
-	// copy the memory map over to kernel parameters
-	params->mmap = (struct aurix_memmap *)mem_alloc(sizeof(struct aurix_memmap) * mmap_entries);
-	if (!(params->mmap)) {
-		log("aurix_get_memmap(): Failed to allocate memory for storing memory map!\n");
-		return false;
-	}
-	params->mmap_entries = mmap_entries;
-
-	for (uint32_t i = 0; i < mmap_entries; i++) {
-		params->mmap[i].base = mmap[i].base;
-		params->mmap[i].size = mmap[i].size;
-		switch (mmap[i].type) {
-			case MemMapReserved:
-			case MemMapFaulty:
-			case MemMapFirmware:
-				params->mmap[i].type = AURIX_MMAP_RESERVED;
-				break;
-			case MemMapACPIReclaimable:
-				params->mmap[i].type = AURIX_MMAP_ACPI_RECLAIMABLE;
-				break;
-			case MemMapACPIMappedIO:
-				params->mmap[i].type = AURIX_MMAP_ACPI_MAPPED_IO;
-				break;
-			case MemMapACPIMappedIOPortSpace:
-				params->mmap[i].type = AURIX_MMAP_ACPI_MAPPED_IO_PORTSPACE;
-				break;
-			case MemMapACPINVS:
-				params->mmap[i].type = AURIX_MMAP_ACPI_NVS;
-				break;
-			case MemMapFreeOnLoad:
-				params->mmap[i].type = AURIX_MMAP_BOOTLOADER_RECLAIMABLE;
-				break;
-			case MemMapUsable:
-				params->mmap[i].type = AURIX_MMAP_USABLE;
-				break;
-			default:
-				log("aurix_get_memmap(): Unknown memory type in entry %u (%u), setting as reserved.\n", i, mmap[i].type);
-				params->mmap[i].type = AURIX_MMAP_RESERVED;
-				break;
-		}
-	}
-
-	return true;
-}
-
-bool aurix_get_framebuffer(struct aurix_parameters *params)
-{
-	struct fb_mode *modes;
-	int current_mode;
-	uint32_t *fb_addr;
-
-	params->framebuffer = (struct aurix_framebuffer *)mem_alloc(sizeof(struct aurix_framebuffer));
-	if (!(params->framebuffer)) {
-		log("aurix_get_framebuffer(): Failed to allocate memory for framebuffer information!\n");
-		return false;
-	}
-
-	if (!get_framebuffer(&fb_addr, &modes, NULL, &current_mode)) {
-		log("aurix_get_framebuffer(): get_framebuffer() returned false, setting everything to 0.\n");
-		memset(params->framebuffer, 0, sizeof(struct aurix_framebuffer));
-		return false;
-	}
-
-	params->framebuffer->addr = (uintptr_t)fb_addr;
-	params->framebuffer->width = modes[current_mode].width;
-	params->framebuffer->height = modes[current_mode].height;
-	params->framebuffer->bpp = modes[current_mode].bpp;
-	params->framebuffer->pitch = modes[current_mode].pitch;
-	params->framebuffer->format = modes[current_mode].format;
-
-	return true;
-}
+extern __attribute__((noreturn)) void aurix_handoff(void *pagemap, void *stack, uint64_t entry, void *params);
+extern char _aurix_handoff_start[], _aurix_handoff_end[];
 
 void aurix_load(char *kernel_path)
 {
+	// read kernel -> test read
 	char *kbuf = NULL;
 	vfs_read(kernel_path, &kbuf);
 	
+	// TODO: Do something with the kernel :p
 	pagetable *pm = create_pagemap();
 	if (!pm) {
-		log("aurix_load(): Failed to create kernel pagemap! Halting...\n");
+		debug("aurix_load(): Failed to create kernel pagemap! Halting...\n");
 		// TODO: Halt
 		while (1);
 	}
 
-	axboot_memmap *mmap;
-	uint32_t mmap_entries = get_memmap(&mmap, pm);
+	axboot_memmap *memmap = get_memmap(pm);
 
 	map_pages(pm, (uintptr_t)pm, (uintptr_t)pm, PAGE_SIZE, VMM_WRITABLE);
-
-	void *stack = mem_alloc(AURIX_STACK_SIZE); // 16 KiB stack should be well more than enough
+	map_pages(pm, (uintptr_t)_aurix_handoff_start, (uintptr_t)_aurix_handoff_start, (uint64_t)_aurix_handoff_end - (uint64_t)_aurix_handoff_start, 0);
+	
+	void *stack = mem_alloc(16*1024); // 16 KiB stack should be well more than enough
 	if (!stack) {
-		log("aurix_load(): Failed to allocate stack! Halting...\n");
+		debug("aurix_load(): Failed to allocate stack! Halting...\n");
 		while (1);
 	}
-	memset(stack, 0, AURIX_STACK_SIZE);
 
-	map_pages(pm, (uintptr_t)stack, (uintptr_t)stack, AURIX_STACK_SIZE, VMM_WRITABLE | VMM_NX);
+	map_pages(pm, (uintptr_t)stack, (uintptr_t)stack, 16*1024, VMM_WRITABLE | VMM_NX);
 
-	uintptr_t kernel_addr = 0;
-	void *kernel_entry = (void *)elf_load(kbuf, &kernel_addr, pm);
+	void *kernel_entry = (void *)elf_load(kbuf, pm);
 	if (!kernel_entry) {
-		log("aurix_load(): Failed to load '%s'! Halting...\n", kernel_path);
-		while (1);
-	}
-	mem_free(kbuf);
-
-	struct aurix_parameters parameters = {0};
-
-	// set current revision
-	parameters.revision = AURIX_PROTOCOL_REVISION;
-
-	// translate memory map
-	if (!aurix_get_memmap(&parameters, mmap, mmap_entries, pm)) {
-		log("aurix_load(): Failed to aqcuire memory map!");
+		debug("aurix_load(): Failed to load '%s'! Halting...\n", kernel_path);
+		mem_free(kbuf);
 		while (1);
 	}
 
-	parameters.kernel_addr = kernel_addr;
+	void *parameters = NULL;
 
-	// get RSDP and SMBIOS
-#ifdef ARCH_ACPI_AVAILABLE
-	parameters.rsdp_addr = platform_get_rsdp();
-#endif
+	debug("aurix_load(): Handoff state: pm=0x%llx, stack=0x%llx, kernel_entry=0x%llx\n", pm, stack, kernel_entry);
 
-#ifdef ARCH_SMBIOS_AVAILABLE
-	parameters.smbios_addr = platform_get_smbios();
-#endif
+	// this triggers a #GP ????
+	// aurix_handoff(pm, stack, (uint64_t)kernel_entry, (void *)parameters);
+	// __builtin_unreachable();
 
-	// get framebuffer information
-	if (!aurix_get_framebuffer(&parameters)) {
-		log("aurix_load(): Failed to aqcuire framebuffer information!\n");
-	}
-
-	// map framebuffer
-	map_pages(pm, parameters.framebuffer->addr, parameters.framebuffer->addr, parameters.framebuffer->height * parameters.framebuffer->pitch, VMM_WRITABLE);
-
-	log("aurix_load(): Handoff state: pm=0x%llx, stack=0x%llx, kernel_entry=0x%llx\n", pm, stack, kernel_entry);
-#ifdef AXBOOT_UEFI
-	uefi_exit_bs();
-#endif
-
-	aurix_arch_handoff(kernel_entry, pm, stack, AURIX_STACK_SIZE, &parameters);
+	__asm__ volatile("movq %[pml4], %%cr3\n"
+					"movq %[stack], %%rsp\n"
+					"callq *%[entry]\n"
+					:: [pml4]"r"(pm), [stack]"r"(stack), [entry]"r"(kernel_entry) : "memory");
 	__builtin_unreachable();
 }
diff --git a/boot/common/ui/font.c b/boot/common/ui/font.c
deleted file mode 100644
index e184f75..0000000
--- a/boot/common/ui/font.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  font.c                                                          */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#include <mm/mman.h>
-#include <lib/string.h>
-#include <lib/assert.h>
-#include <vfs/vfs.h>
-#define FONT_IMPLEMENTATION
-#include <ui/ui.h>
-#include <ui/font.h>
-#include <print.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <stdint.h>
-
-bool font_init(struct ui_context *ctx, char *font_path, int size)
-{
-	vfs_read(font_path, &(ctx->font_file));
-	if (!ctx->font_file) {
-		return false;
-	}
-
-	int ssfn_status;
-
-	ssfn_status = ssfn_load(&(ctx->font), (void *)(ctx->font_file));
-	if (ssfn_status != SSFN_OK) {
-		debug("font_init(): SSFN failed to load font: %s!\n", ssfn_error(ssfn_status));
-		goto error;
-	}
-
-	ssfn_status = ssfn_select(&(ctx->font), SSFN_FAMILY_ANY, NULL, SSFN_STYLE_REGULAR, size);
-	if (ssfn_status != SSFN_OK) {
-		debug("font_init(): SSFN failed to select font: %s!\n", ssfn_error(ssfn_status));
-		goto error;
-	}
-
-	// initialize terminal
-	ctx->terminal.font_size = size;
-	ctx->terminal.cx = 0;
-	ctx->terminal.cy = size;
-
-	return true;
-
-error:
-	mem_free(ctx->font_file);
-	return false;
-}
-
-void font_write(struct ui_context *ctx, char *s, uint32_t cx, uint32_t cy)
-{
-	ctx->font_buf.x = cx;
-	ctx->font_buf.y = cy;
-	ssfn_render(&(ctx->font), &(ctx->font_buf), s);
-}
-
-void font_free(struct ui_context *ctx)
-{
-	ssfn_free(&(ctx->font));
-	mem_free(ctx->font_file);
-}
-
-/*
-void font_ttf_init(char *font_path, int initial_size)
-{
-	vfs_read(font_path, (char **)&font_buf);
-	if (!font_buf) {
-		debug("Font not loaded, returning...\n");
-		return;
-	}
-}
-
-void font_psf2_init()
-{
-}
-*/
\ No newline at end of file
diff --git a/boot/common/ui/terminal.c b/boot/common/ui/terminal.c
deleted file mode 100644
index f65e3c3..0000000
--- a/boot/common/ui/terminal.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  terminal.c                                                      */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#include <ui/ui.h>
-#include <ui/terminal.h>
-#include <axboot.h>
-#include <print.h>
-
-#include <stdarg.h>
-
-#define HORIZONTAL_TAB_WIDTH 8
-
-void terminal_print(struct ui_context *ctx, char *fmt, ...)
-{
-	va_list args;
-	char buf[4096] = {0};
-	char *s = (char *)&buf;
-
-	va_start(args, fmt);
-	vsnprintf((char *)&buf, sizeof(buf), fmt, args);
-	va_end(args);
-
-	while (*s) {
-		switch (*s) {
-			case '\t': {
-				// horizontal tab - 4 spaces
-				int w, h;
-				ssfn_bbox(&(ctx->font), " ", &w, &h, NULL, NULL);
-				if (ctx->terminal.cx >= ctx->fb_modes[ctx->current_mode].width - (w * HORIZONTAL_TAB_WIDTH)) {
-					for (int i = 1; i <= HORIZONTAL_TAB_WIDTH; i++) {
-						if (ctx->terminal.cx >= ctx->fb_modes[ctx->current_mode].width - (w * i)) {
-							ctx->terminal.cx = ((HORIZONTAL_TAB_WIDTH * (w + 1)) - (w * i));
-							ctx->terminal.cy += h;
-							break;
-						}
-					}
-				} else {
-					ctx->terminal.cx += w * HORIZONTAL_TAB_WIDTH;
-				}
-				break;
-			}
-			case '\n': {
-				// newline
-				ctx->terminal.cx = 0;
-				ctx->terminal.cy += ctx->terminal.font_size;
-				break;
-			}
-			default: {
-				// printable character
-				const char str[2] = {*s, 0};
-				int w, h;
-				ssfn_bbox(&(ctx->font), (char *)&str, &w, &h, NULL, NULL);
-				if (ctx->terminal.cx + w >= ctx->fb_modes[ctx->current_mode].width) {
-					ctx->terminal.cx = 0;
-					ctx->terminal.cy += h;
-				}
-				font_write(ctx, (char *)&str, ctx->terminal.cx, ctx->terminal.cy);
-				ctx->terminal.cx += w;
-				break;
-			}
-		}
-		s++;
-	}
-}
-
-void terminal_setcur(struct ui_context *ui, uint32_t x, uint32_t y)
-{
-	ui->terminal.cx = x;
-	ui->terminal.cy = y;
-}
diff --git a/boot/common/ui/ui.c b/boot/common/ui/ui.c
deleted file mode 100644
index 80c5239..0000000
--- a/boot/common/ui/ui.c
+++ /dev/null
@@ -1,290 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  ui.c                                                            */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#include <config/config.h>
-#include <lib/string.h>
-#include <ui/framebuffer.h>
-#include <ui/keyboard.h>
-#include <ui/mouse.h>
-#include <ui/font.h>
-#include <ui/ui.h>
-#include <loader/loader.h>
-#include <time/dt.h>
-#include <i18n.h>
-#include <axboot.h>
-
-#include <print.h>
-#include <stdint.h>
-
-enum {
-	EVENT_TIME = (1 << 0),
-	EVENT_TIMEOUT = (1 << 1),
-	EVENT_MOUSE = (1 << 2),
-
-	EVENT_NEXT_ENTRY = (1 << 3),
-	EVENT_PREV_ENTRY = (1 << 4),
-	EVENT_NEXT_TAB = (1 << 5),
-
-	EVENT_LANG_CHANGE = (1 << 6),
-};
-
-struct datetime last_dt;
-
-bool gui_init(struct ui_context *ctx)
-{
-	if (!font_init(ctx, "\\AxBoot\\fonts\\vera\\Vera.sfn", 16)) {
-		return false;
-	}
-
-	return false;
-}
-
-bool tui_init(struct ui_context *ctx)
-{
-	if (!font_init(ctx, "\\AxBoot\\fonts\\u_vga16\\u_vga16.sfn", 16)) {
-		return false;
-	}
-
-	int width = ctx->fb_modes[ctx->current_mode].width;
-	int height = ctx->fb_modes[ctx->current_mode].height;
-	int width_center = width / 2;
-	int height_center = height / 2;
-
-	int w, h;
-
-	// display string at the top center of the screen
-	char *top_string = BOOTLOADER_NAME_STR " v" BOOTLOADER_VERSION_STR;
-	ssfn_bbox(&(ctx->font), top_string, &w, NULL, NULL, NULL);
-
-	terminal_setcur(ctx, width_center - (w / 2), height / 32);
-	terminal_print(ctx, top_string);
-
-	// display current language
-	char lang_str[64];
-	snprintf((char *)&lang_str, 64, "%s: %s", i18n_curlang->lang->language, i18n_curlang->name);
-	ssfn_bbox(&(ctx->font), (char *)lang_str, &w, &h, NULL, NULL);
-	terminal_setcur(ctx, width - w - ctx->font.size, height - h);
-	terminal_print(ctx, (char *)lang_str);
-
-	// display all entries
-	int entry_count = config_get_entry_count();
-	int entry_height_offset = height_center - ((h * entry_count) / 2);
-	struct axboot_entry *entries = config_get_entries();
-
-	for (int i = 0; i < entry_count; i++) {
-		debug("tui_init(): Drawing entries... (%u/%u)\n", i, entry_count);
-		ssfn_bbox(&(ctx->font), entries[i].name, &w, &h, NULL, NULL);
-		terminal_setcur(ctx, width_center - (w/2), entry_height_offset + (i * h));
-		terminal_print(ctx, entries[i].name);
-	}
-	
-	// highlight default entry
-	int default_entry = ctx->current_selection;
-	char final_selent[128];
-	int f_w, f_h;
-	ssfn_bbox(&(ctx->font), " ", &f_w, &f_h, NULL, NULL);
-	snprintf((char *)&final_selent, 128, "> %s <", entries[default_entry].name);
-	ssfn_bbox(&(ctx->font), entries[default_entry].name, &w, &h, NULL, NULL);
-	terminal_setcur(ctx, width_center - (w/2) - (f_w*2), entry_height_offset + (default_entry * h));
-	terminal_print(ctx, "> ");
-	terminal_setcur(ctx, width_center + (w/2), entry_height_offset + (default_entry * h));
-	terminal_print(ctx, " <");
-
-	return true;
-}
-
-void gui_draw(struct ui_context *ctx, struct datetime *dt, struct language_selection *newlang, struct mouse_event *mouse_status, uint8_t event)
-{
-	(void)ctx;
-	(void)dt;
-	(void)newlang;
-	(void)mouse_status;
-	(void)event;
-}
-
-void tui_draw(struct ui_context *ctx, struct datetime *dt, struct language_selection *newlang, struct mouse_event *mouse_status, uint8_t event)
-{
-	(void)mouse_status;
-
-	// display the current date and time at the bottom left corner of the screen
-	if (event & EVENT_TIME) {
-		int w, h;
-		char dt_str[20] = {0}; // YYYY/mm/dd HH:MM:SS
-		snprintf((char *)&dt_str, 20, "%.4u/%.2u/%.2u %.2u:%.2u:%.2u", dt->year, dt->month, dt->day, dt->h, dt->m, dt->s);
-
-		ssfn_bbox(&(ctx->font), (char *)dt_str, &w, &h, NULL, NULL);
-
-		for (uint32_t y = ctx->fb_modes[ctx->current_mode].height - (2*h); y < ctx->fb_modes[ctx->current_mode].height - h; y++) {
-			for (int x = 0; x < w; x++) {
-				*((uint32_t *)ctx->fb_addr + (ctx->fb_modes[ctx->current_mode].pitch / ctx->fb_modes[ctx->current_mode].bpp) * y + x) = 0xFF000000;
-			}
-		}
-		terminal_setcur(ctx, 0, ctx->fb_modes[ctx->current_mode].height - h);
-		terminal_print(ctx, (char *)dt_str);
-
-		// update last datetime
-		last_dt = *dt;
-	}
-
-	// timeout update
-	if (event & EVENT_TIMEOUT) {
-		// TODO
-	}
-
-	// select next entry
-	if (event & EVENT_NEXT_ENTRY) {
-		// TODO
-	}
-
-	// select previous entry
-	if (event & EVENT_PREV_ENTRY) {
-		// TODO
-	}
-
-	// update language
-	if (event & EVENT_LANG_CHANGE) {
-		int w, h;
-		char curlang_str[64];
-		snprintf((char *)&curlang_str, 64, "%s: %s", i18n_curlang->lang->language);
-		ssfn_bbox(&(ctx->font), (char *)curlang_str, &w, &h, NULL, NULL);
-		for (uint32_t y = ctx->fb_modes[ctx->current_mode].height - (2*h); y < ctx->fb_modes[ctx->current_mode].height - h; y++) {
-			for (int x = 0; x < w; x++) {
-				*((uint32_t *)ctx->fb_addr + (ctx->fb_modes[ctx->current_mode].pitch / ctx->fb_modes[ctx->current_mode].bpp) * y + x) = 0xFF000000;
-			}
-		}
-
-		i18n_curlang = newlang;
-
-		char newlang_str[64];
-		snprintf((char *)&curlang_str, 64, "%s: %s", i18n_curlang->lang->language);
-		ssfn_bbox(&(ctx->font), (char *)curlang_str, &w, &h, NULL, NULL);
-		terminal_setcur(ctx, ctx->fb_modes[ctx->current_mode].width - w, ctx->fb_modes[ctx->current_mode].height - h);
-		terminal_print(ctx, (char *)newlang_str);
-	}
-}
-
-void ui_init()
-{
-	struct ui_context ctx = {0};
-
-	if (!get_framebuffer(&ctx.fb_addr, &ctx.fb_modes, &ctx.total_modes, &ctx.current_mode)) {
-		debug("ui_init(): Failed to acquire a framebuffer!\n");
-		while (1);
-	}
-
-	ctx.ui = config_get_ui_mode();
-
-	debug("Dumping framebuffer information\n");
-	debug("--------------------------------\n");
-	debug("Address: 0x%llx\n", ctx.fb_addr);
-
-	for (int i = 0; i < ctx.total_modes; i++) {
-		debug("Mode %u:%s | ", i, (i == ctx.current_mode) ? " (current)" : "");
-		debug("Resolution: %ux%u | ", ctx.fb_modes[i].width, ctx.fb_modes[i].height);
-		debug("Bytes Per Pixel: %u | ", ctx.fb_modes[i].bpp);
-		debug("Pitch: %u | ", ctx.fb_modes[i].pitch);
-		debug("Format: %s\n", ctx.fb_modes[i].format == FB_RGBA ? "RGBA" : "BGRA");
-	}
-
-	ctx.font_buf.ptr = (uint8_t *)ctx.fb_addr;
-	ctx.font_buf.w = ctx.fb_modes[ctx.current_mode].width;
-	ctx.font_buf.h = ctx.fb_modes[ctx.current_mode].height;
-	ctx.font_buf.p = ctx.fb_modes[ctx.current_mode].pitch;
-	ctx.font_buf.x = 0;
-	ctx.font_buf.y = 0;
-	ctx.font_buf.fg = 0xFFFFFFFF;
-
-	ctx.current_selection = config_get_default();
-
-	void (*ui_callback)(struct ui_context*,struct datetime*,struct language_selection*,struct mouse_event*,uint8_t) = NULL;
-
-	switch (ctx.ui) {
-		case UI_MODERN: {
-			if (!gui_init(&ctx)) {
-				debug("ui_init(): Failed to initialize modern UI, booting default selection...\n");
-				break;
-			}
-			ui_callback = gui_draw;
-			break;
-		}
-		default:
-		case UI_TEXT: {
-			if (!tui_init(&ctx)) {
-				debug("ui_init(): Failed to initialize text UI, booting default selection...\n");
-				break;
-			}
-			ui_callback = tui_draw;
-			break;
-		}
-	}
-
-	struct datetime dt;
-	struct mouse_event me;
-
-	while (1) {
-		uint8_t event = 0;
-
-		// datetime?
-		get_datetime(&dt);
-		if (memcmp(&dt, &last_dt, sizeof(struct datetime)) != 0) {
-			event |= EVENT_TIME;
-		}
-
-		// mouse movement?
-		get_mouse(&(me.x), &(me.y), &(me.but));
-		if (memcmp(&me, &(ctx.last_mouse), sizeof(struct mouse_event)) != 0) {
-			event |= EVENT_MOUSE;
-		}
-
-		// keypress?
-		uint16_t scancode;
-		get_keypress(&scancode);
-		if (scancode != 0) {
-			switch (scancode) {
-				case SCANCODE_ARROW_DOWN:
-					event |= EVENT_NEXT_ENTRY;
-					break;
-				case SCANCODE_ARROW_UP:
-					event |= EVENT_PREV_ENTRY;
-					break;
-				case SCANCODE_ENTER:
-					// clear the screen
-					for (uint32_t y = 0; y < ctx.fb_modes[ctx.current_mode].height; y++) {
-						for (uint32_t x = 0; x < ctx.fb_modes[ctx.current_mode].width; x++) {
-							*((uint32_t *)ctx.fb_addr + (ctx.fb_modes[ctx.current_mode].pitch / ctx.fb_modes[ctx.current_mode].bpp) * y + x) = 0xFF000000;
-						}
-					}
-					struct axboot_entry *entries = config_get_entries();
-					loader_load(&entries[ctx.current_selection]);
-					break;
-				default:
-					break;
-			}
-		}
-
-		if (event != 0) {
-			ui_callback(&ctx, &dt, NULL, &me, event);
-		} else {
-#ifdef __x86_64
-			__asm__ volatile("hlt");
-#endif
-			//arch_wait();
-		}
-	}
-}
diff --git a/boot/common/vfs/vfs.c b/boot/common/vfs/vfs.c
index 63403a0..103928f 100644
--- a/boot/common/vfs/vfs.c
+++ b/boot/common/vfs/vfs.c
@@ -36,19 +36,19 @@ int vfs_init(char *root_mountpoint)
 {
 	boot_drive = mount_boot_volume(root_mountpoint);
 	if (boot_drive == NULL) {
-		log("vfs_init(): Failed to allocate memory for VFS!\n");
+		debug("vfs_init(): Failed to allocate memory for VFS!\n");
 		// fuck off and boot out early.
 		return 0;
 	}
 
-	log("vfs_init(): Mounted boot drive to \"\\\"\n");
+	debug("vfs_init(): Mounted boot drive to \"/\"\n");
 	return 1;
 }
 
 size_t vfs_read(char *filename, char **buf)
 {
 	if (boot_drive->fs->read == NULL) {
-		log("vfs_read(): Filesystem didn't set up a read function!\n");
+		debug("vfs_read(): Filesystem didn't set up a read function!");
 		return 0;
 	}
 
@@ -57,10 +57,9 @@ size_t vfs_read(char *filename, char **buf)
 
 int vfs_write(char *filename, char *buf, size_t len)
 {
-	if (boot_drive->fs->write == NULL) {
-		log("vfs_read(): Filesystem didn't setup a write function!\n");
-		return 0;
-	}
+	(void)filename;
+	(void)buf;
+	(void)len;
 
-	return boot_drive->fs->write(filename, buf, len, boot_drive, boot_drive->fs->fsdata);
+	return 0;
 }
\ No newline at end of file
diff --git a/boot/include/acpi/acpi.h b/boot/include/acpi/acpi.h
deleted file mode 100644
index 485d3f7..0000000
--- a/boot/include/acpi/acpi.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  acpi.h                                                          */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#ifndef _ACPI_ACPI_H
-#define _ACPI_ACPI_H
-
-#include <stdint.h>
-
-uintptr_t platform_get_rsdp(void);
-uintptr_t platform_get_smbios(void);
-
-#endif /* _ACPI_ACPI_H */
diff --git a/boot/include/arch/x86_64/arch/cpu/idt.h b/boot/include/arch/x86_64/arch/cpu/idt.h
deleted file mode 100644
index 3ce588a..0000000
--- a/boot/include/arch/x86_64/arch/cpu/idt.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  idt.h                                                           */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#ifndef _ARCH_CPU_IDT_H
-#define _ARCH_CPU_IDT_H
-
-#include <stdint.h>
-
-struct idt_descriptor {
-};
-
-struct idtr {
-	uint16_t limit;
-	uint64_t base;
-};
-
-#endif /* _ARCH_CPU_IDT_H */
diff --git a/boot/include/arch/x86_64/arch/lib/math.h b/boot/include/arch/x86_64/arch/lib/math.h
deleted file mode 100644
index ec31a92..0000000
--- a/boot/include/arch/x86_64/arch/lib/math.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  math.h                                                          */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#ifndef _ARCH_LIB_MATH_H
-#define _ARCH_LIB_MATH_H
-
-#include <stdbool.h>
-
-static double _sqrt(double n)
-{
-    double out;
-    __asm__ volatile("fldl %[input];"
-                     "fsqrt;"
-                     "fstpl %[output];"
-                     : [ output ] "=g"(out)
-                     : [ input ] "g"(n)
-                     :);
-    return out;
-}
-
-static double _cos(double n)
-{
-    double out;
-    __asm__ volatile("fldl %[input];"
-                     "fcos;"
-                     "fstpl %[output];"
-                     : [ output ] "=g"(out)
-                     : [ input ] "g"(n)
-                     :);
-    return out;
-}
-
-static double _acos(double n)
-{
-    double imd = _sqrt(1 - (n * n));
-    double out;
-    __asm__ volatile("fldl %[imd];"
-                     "fldl %[input];"
-                     "fpatan;"
-                     "fstpl %[output];"
-                     : [ output ] "=g"(out)
-                     : [ input ] "g"(n), [ imd ] "g"(imd)
-                     :);
-    return out;
-}
-
-static int _ifloor(double d)
-{
-    if ((((double)((int)d)) == d) || (d >= 0))
-        return (int)d;
-    return (int)(d - 1);
-}
-
-static int _iceil(double d)
-{
-    if ((((double)((int)d)) == d) || (d < 0))
-        return (int)d;
-    return (int)(d + 1);
-}
-
-static double _pow(double a, int n)
-{
-    double prod = 1;
-    bool neg = (n < 0);
-    n = neg ? -n : n;
-    for (int i = 0; i < n; i++)
-        prod = prod * a;
-    if (neg)
-        prod = 1 / prod;
-    return prod;
-}
-
-static double _fmod(double x, double y)
-{
-    return x - ((int)(x / y)) * y;
-}
-
-#endif /* _ARCH_LIB_MATH_H */
diff --git a/boot/include/axboot.h b/boot/include/axboot.h
index 4b52340..bd2d491 100644
--- a/boot/include/axboot.h
+++ b/boot/include/axboot.h
@@ -29,14 +29,6 @@
 	#define UNREACHABLE() __builtin_unreachable()
 #endif
 
-// TODO: This is hacky
-#define axboot_halt() while (1);
-
 void axboot_init(void);
 
-// I really had no idea where to put this
-#ifdef AXBOOT_UEFI
-void uefi_exit_bs(void);
-#endif
-
 #endif /* _AXBOOT_H */
\ No newline at end of file
diff --git a/boot/include/config/config.h b/boot/include/config/config.h
deleted file mode 100644
index b18227f..0000000
--- a/boot/include/config/config.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  config.h                                                        */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#ifndef _CONFIG_CONFIG_H
-#define _CONFIG_CONFIG_H
-
-enum {
-	UI_TEXT = 0,
-	UI_MODERN = 1
-};
-
-struct axboot_cfg {
-	// overridable stuff
-	int default_entry;
-	int timeout;
-	int ui_mode;
-
-	int entry_count;
-	char *bootlog_filename;
-};
-
-struct axboot_entry {
-	char *name;
-	char *description;
-	char *image_path;
-	int protocol;
-};
-
-void config_init(void);
-
-int config_get_timeout();
-int config_get_default();
-int config_get_entry_count();
-struct axboot_entry *config_get_entries();
-int config_get_ui_mode();
-
-#endif /* _CONFIG_CONFIG_H */
diff --git a/boot/include/data/da.h b/boot/include/data/da.h
deleted file mode 100644
index aff4214..0000000
--- a/boot/include/data/da.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  da.b                                                            */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#ifndef _DATA_DA_H
-#define _DATA_DA_H
-
-#include <mm/mman.h>
-#include <print.h>
-#include <stddef.h>
-#include <efilib.h>
-
-#define DA_INIT_CAPACITY 8192
-#define DA_REALLOC(oldptr, newsz) mem_realloc(oldptr, newsz)
-
-#define da_append(da, item) \
-	do {\
-		if ((da)->count >= (da)->capacity) { \
-			size_t new_capacity = (da)->capacity + DA_INIT_CAPACITY; \
-			(da)->items = DA_REALLOC((da)->items, new_capacity * sizeof((da)->items[0])); \
-			(da)->capacity = new_capacity; \
-		} \
-		(da)->items[(da)->count++] = (item); \
-	} while (0)
-
-#endif /* _DATA_DA_H */
diff --git a/boot/include/data/list.h b/boot/include/data/list.h
deleted file mode 100644
index 3cc78a0..0000000
--- a/boot/include/data/list.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  list.h                                                          */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#ifndef _DATA_LIST_H
-#define _DATA_LIST_H
-
-#include <stdint.h>
-
-typedef struct _ListNode {
-	void *data;
-	struct _ListNode *prev;
-	struct _ListNode *next;
-} ListNode;
-
-typedef struct _List {
-	uint32_t count;
-	ListNode *root;
-} List;
-
-List *list_new();
-
-int list_add(List *list, void *data);
-void *list_remove_at(List *list, uint32_t idx);
-
-ListNode *listnode_new(void *data);
-
-void *list_get_at(List *list, uint32_t idx);
-
-#endif /* _DATA_LIST_H */
diff --git a/boot/include/fs/uefi_sfs.h b/boot/include/fs/uefi_sfs.h
index 6969f99..97d7ad4 100644
--- a/boot/include/fs/uefi_sfs.h
+++ b/boot/include/fs/uefi_sfs.h
@@ -26,6 +26,5 @@
 struct vfs_drive *sfs_init(char *mountpoint);
 
 size_t sfs_read(char *filename, char **buffer, struct vfs_drive *dev, void *fsdata);
-uint8_t sfs_write(char *filename, char *buffer, size_t size, struct vfs_drive *dev, void *fsdata);
 
 #endif /* _FS_UEFI_SFS_H */
diff --git a/boot/include/i18n.h b/boot/include/i18n.h
deleted file mode 100644
index 3aff9cd..0000000
--- a/boot/include/i18n.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  i18n.h                                                          */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#ifndef _I18N_H
-#define _I18N_H
-
-struct language {
-	char *shutdown;
-	char *reboot;
-	char *reboot_to_firmware;
-	char *resolution;
-
-	char *language;
-};
-
-struct language_selection {
-	char *name;
-	char *code;
-	struct language *lang;
-};
-
-extern struct language_selection *i18n_curlang;
-
-#endif /* _I18N_H */
diff --git a/boot/include/lib/assert.h b/boot/include/lib/assert.h
deleted file mode 100644
index 09d88ca..0000000
--- a/boot/include/lib/assert.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  assert.h                                                        */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#ifndef _LIB_ASSERT_H
-#define _LIB_ASSERT_H
-
-#include <print.h>
-#include <axboot.h>
-
-#define assert(expr, msg) \
-	do { \
-		if (!!(expr)) { \
-			log("Assertion failed in file %s, line %u: %s\n", __FILE__, __LINE__, msg); \
-			axboot_halt(); \
-		} \
-	} while (0)
-
-#endif /* _LIB_ASSERT_H */
diff --git a/boot/include/lib/string.h b/boot/include/lib/string.h
index 50778e3..7585234 100644
--- a/boot/include/lib/string.h
+++ b/boot/include/lib/string.h
@@ -30,8 +30,6 @@ size_t strlen(const char *str);
 int strcmp(const char *s1, const char *s2);
 int strncmp(const char *s1, const char *s2, size_t n);
 char *strcpy(char *dest, const char *src);
-char *strncpy(char *dest, const char *src, size_t n);
-char *strncat(char *dest, const char *src, size_t n);
 char *strdup(const char *s);
 char *strtok(char *str, const char *delim);
 char *strchr(char *s, int c);
diff --git a/boot/include/loader/elf.h b/boot/include/loader/elf.h
index 6252231..0613173 100644
--- a/boot/include/loader/elf.h
+++ b/boot/include/loader/elf.h
@@ -73,6 +73,6 @@ struct elf_program_header {
 #define PF_W 0x2
 #define PF_R 0x4
 
-uintptr_t elf_load(char *kernel, uintptr_t *addr, pagetable *pagemap);
+uintptr_t elf_load(char *kernel, pagetable *pagemap);
 
 #endif /* _LOADER_ELF_H */
diff --git a/boot/include/loader/loader.h b/boot/include/loader/loader.h
deleted file mode 100644
index 0cd2d84..0000000
--- a/boot/include/loader/loader.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  loader.h                                                        */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#ifndef _LOADER_LOADER_H
-#define _LOADER_LOADER_H
-
-enum loader_protocol {
-	PROTO_AURIX,
-#ifdef AXBOOT_UEFI
-	PROTO_CHAINLOAD,
-#endif
-
-	PROTO_UNSUPPORTED
-};
-
-void loader_load(struct axboot_entry *entry);
-
-int proto_str_to_int(char *proto);
-
-#endif /* _LOADER_LOADER_H */
diff --git a/boot/include/mm/memmap.h b/boot/include/mm/memmap.h
index 5679d01..6f2e629 100644
--- a/boot/include/mm/memmap.h
+++ b/boot/include/mm/memmap.h
@@ -20,7 +20,6 @@
 #ifndef _MEM_MEMMAP_H
 #define _MEM_MEMMAP_H
 
-#include <mm/vmm.h>
 #include <stdint.h>
 
 enum AxBootMemMapType {
@@ -46,6 +45,6 @@ typedef struct _axboot_memmap {
 	int type;
 } axboot_memmap;
 
-uint32_t get_memmap(axboot_memmap **map, pagetable *pm);
+axboot_memmap *get_memmap();
 
 #endif /* _MEM_MEMMAP_H */
\ No newline at end of file
diff --git a/boot/include/power.h b/boot/include/power.h
deleted file mode 100644
index 25ec492..0000000
--- a/boot/include/power.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  power.h                                                         */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#ifndef _POWER_H
-#define _POWER_H
-
-#include <stdbool.h>
-
-bool platform_is_reboot_to_fw_possible();
-void platform_reboot_to_fw();
-void platform_reboot();
-void platform_shutdown();
-
-#endif /* _POWER_H */
diff --git a/boot/include/print.h b/boot/include/print.h
index d0e4ecb..751d7f7 100644
--- a/boot/include/print.h
+++ b/boot/include/print.h
@@ -31,6 +31,5 @@ void debug(const char *fmt, ...);
 void printstr(const char *str);
 
 void snprintf(char *buf, size_t size, const char *fmt, ...);
-void vsnprintf(char *buf, size_t size, const char *fmt, va_list args);
 
 #endif /* _PRINT_H */
\ No newline at end of file
diff --git a/boot/include/proto/aurix.h b/boot/include/proto/aurix.h
index e3b26f2..8863e29 100644
--- a/boot/include/proto/aurix.h
+++ b/boot/include/proto/aurix.h
@@ -17,68 +17,9 @@
 /* SOFTWARE.                                                                     */
 /*********************************************************************************/
 
-#ifndef _AURIX_H
-#define _AURIX_H
+#ifndef _PROTO_AURIX_H
+#define _PROTO_AURIX_H
 
-#include <stdint.h>
-
-#define AURIX_PROTOCOL_REVISION 1
-
-enum aurix_memmap_entry {
-	AURIX_MMAP_RESERVED = 0,
-	
-	AURIX_MMAP_ACPI_RECLAIMABLE = 1,
-	AURIX_MMAP_ACPI_MAPPED_IO = 2,
-	AURIX_MMAP_ACPI_MAPPED_IO_PORTSPACE = 3,
-	AURIX_MMAP_ACPI_NVS = 4,
-
-	AURIX_MMAP_BOOTLOADER_RECLAIMABLE = 6,
-	AURIX_MMAP_USABLE = 7
-};
-
-enum aurix_framebuffer_format {
-	AURIX_FB_RGBA = 0,
-	AURIX_FB_BGRA = 1
-};
-
-struct aurix_memmap {
-	uintptr_t base;
-	uint32_t size;
-	uint8_t type;
-};
-
-struct aurix_framebuffer {
-	uintptr_t addr;
-	uint32_t width;
-	uint32_t height;
-	uint8_t bpp; // bits!
-	uint32_t pitch;
-	int format;
-};
-
-struct aurix_parameters {
-	// PROTOCOL INFO
-	uint8_t revision;
-
-	// MEMORY
-	struct aurix_memmap *mmap;
-	uint32_t mmap_entries;
-
-	uintptr_t kernel_addr; // physical address
-
-	// RSDP and SMBIOS
-	uintptr_t rsdp_addr;
-	uintptr_t smbios_addr;
-
-	// FRAMEBUFFER
-	struct aurix_framebuffer *framebuffer;
-};
-
-#ifdef _AXBOOT
-#include <mm/vmm.h>
 void aurix_load(char *kernel);
 
-void aurix_arch_handoff(void *kernel_entry, pagetable *pm, void *stack, uint32_t stack_size, struct aurix_parameters *parameters);
-#endif
-
 #endif /* _PROTO_AURIX_H */
diff --git a/boot/include/time/dt.h b/boot/include/time/dt.h
deleted file mode 100644
index 8cc52e2..0000000
--- a/boot/include/time/dt.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  dt.h                                                            */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#ifndef _TIME_DT_H
-#define _TIME_DT_H
-
-struct datetime {
-	int year;
-	int month;
-	int day;
-
-	int h;
-	int m;
-	int s;
-};
-
-void get_datetime(struct datetime *dt);
-
-#endif /* _TIME_DT_H */
diff --git a/boot/include/uart/uart.h b/boot/include/uart/uart.h
deleted file mode 100644
index 29134cd..0000000
--- a/boot/include/uart/uart.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  uart.h                                                          */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#ifndef _UART_UART_H
-#define _UART_UART_H
-
-#include <stdint.h>
-
-void uart_init(uint32_t baud_rate);
-
-void uart_send(char c);
-void uart_sendstr(char *str);
-
-#endif /* _UART_UART_H */
diff --git a/boot/include/ui/font.h b/boot/include/ui/font.h
deleted file mode 100644
index e00de20..0000000
--- a/boot/include/ui/font.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  font.h                                                          */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#ifndef _UI_FONT_H
-#define _UI_FONT_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-struct ui_context;
-
-bool font_init(struct ui_context *ctx, char *font_path, int size);
-void font_free(struct ui_context *ctx);
-
-void font_write(struct ui_context *ctx, char *s, uint32_t cx, uint32_t cy);
-
-#endif /* _UI_FONT_H */
diff --git a/boot/include/ui/framebuffer.h b/boot/include/ui/framebuffer.h
deleted file mode 100644
index eb9971b..0000000
--- a/boot/include/ui/framebuffer.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  framebuffer.h                                                   */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#ifndef _UI_FRAMEBUFFER_H
-#define _UI_FRAMEBUFFER_H
-
-#include <stdint.h>
-#include <stdbool.h>
-
-enum fb_format {
-	FB_RGBA = 0,
-	FB_BGRA = 1
-};
-
-struct fb_mode {
-	uint32_t width;
-	uint32_t height;
-	uint8_t bpp;
-	uint32_t pitch;
-	int format;
-};
-
-bool get_framebuffer(uint32_t **fb_addr, struct fb_mode **available_modes, int *total_modes, int *current_mode_index);
-
-#endif /* _UI_FRAMEBUFFER_H */
\ No newline at end of file
diff --git a/boot/include/ui/keyboard.h b/boot/include/ui/keyboard.h
deleted file mode 100644
index 4dace84..0000000
--- a/boot/include/ui/keyboard.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  keyboard.c                                                      */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#ifndef _UI_KEYBOARD_H
-#define _UI_KEYBOARD_H
-
-#include <stdint.h>
-
-#define SCANCODE_ARROW_UP 0x1
-#define SCANCODE_ARROW_DOWN 0x2
-#define SCANCODE_ENTER 43
-
-void get_keypress(uint16_t *scancode);
-
-#endif /* _UI_KEYBOARD_H */
diff --git a/boot/include/ui/mouse.h b/boot/include/ui/mouse.h
deleted file mode 100644
index 2d1d68d..0000000
--- a/boot/include/ui/mouse.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  mouse.h                                                         */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#ifndef _UI_MOUSE_H
-#define _UI_MOUSE_H
-
-enum {
-	LEFT_MOUSE_BUTTON = 0x1,
-	MIDDLE_MOUSE_BUTTON = 0x2,
-	RIGHT_MOUSE_BUTTON = 0x4
-};
-
-void get_mouse(uint16_t *mouse_x, uint16_t *mouse_y, uint8_t *mouse_buttons);
-
-#endif /* _UI_MOUSE_H */
diff --git a/boot/include/ui/ssfn.h b/boot/include/ui/ssfn.h
deleted file mode 100644
index 17361ef..0000000
--- a/boot/include/ui/ssfn.h
+++ /dev/null
@@ -1,1604 +0,0 @@
-/*
- * ssfn.h
- * https://gitlab.com/bztsrc/scalable-font2
- *
- * Copyright (C) 2020 - 2024 bzt
- *
- * 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:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * 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 OR COPYRIGHT
- * HOLDERS 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.
- *
- * @brief Scalable Screen Font renderers
- *
- */
-
-#ifndef _SSFN_H_
-#define _SSFN_H_
-
-#define SSFN_VERSION 0x0200
-
-#ifdef  __cplusplus
-extern "C" {
-# ifndef __THROW
-#  define __THROW throw()
-# endif
-#else
-# ifndef __THROW
-#  define __THROW
-# endif
-#endif
-/* if stdint.h was not included before us */
-/*
-#if !defined(_STDINT) && !defined(_STDINT_H)
-typedef unsigned char       uint8_t;
-typedef unsigned short int  uint16_t;
-typedef short int           int16_t;
-typedef unsigned int        uint32_t;
-#ifndef _UINT64_T
-typedef unsigned long int   uint64_t;
-#endif
-#endif
-*/
-
-/***** file format *****/
-
-/* magic bytes */
-#define SSFN_MAGIC "SFN2"
-#define SSFN_COLLECTION "SFNC"
-#define SSFN_ENDMAGIC "2NFS"
-
-/* ligatures area */
-#define SSFN_LIG_FIRST          0xF000
-#define SSFN_LIG_LAST           0xF8FF
-
-/* font family group in font type byte */
-#define SSFN_TYPE_FAMILY(x)     ((x)&15)
-#define SSFN_FAMILY_SERIF       0
-#define SSFN_FAMILY_SANS        1
-#define SSFN_FAMILY_DECOR       2
-#define SSFN_FAMILY_MONOSPACE   3
-#define SSFN_FAMILY_HAND        4
-
-/* font style flags in font type byte */
-#define SSFN_TYPE_STYLE(x)      (((x)>>4)&15)
-#define SSFN_STYLE_REGULAR      0
-#define SSFN_STYLE_BOLD         1
-#define SSFN_STYLE_ITALIC       2
-#define SSFN_STYLE_USRDEF1      4     /* user defined variant 1 */
-#define SSFN_STYLE_USRDEF2      8     /* user defined variant 2 */
-
-/* contour commands */
-#define SSFN_CONTOUR_MOVE       0
-#define SSFN_CONTOUR_LINE       1
-#define SSFN_CONTOUR_QUAD       2
-#define SSFN_CONTOUR_CUBIC      3
-
-/* glyph fragments, kerning groups and hinting grid info */
-#define SSFN_FRAG_CONTOUR       0
-#define SSFN_FRAG_BITMAP        1
-#define SSFN_FRAG_PIXMAP        2
-#define SSFN_FRAG_KERNING       3
-#define SSFN_FRAG_HINTING       4
-
-/* main SSFN header, 32 bytes */
-#ifndef _MSC_VER
-#define _pack __attribute__((packed))
-#else
-#define _pack
-#pragma pack(push)
-#pragma pack(1)
-#endif
-typedef struct {
-    uint8_t     magic[4];             /* SSFN magic bytes */
-    uint32_t    size;                 /* total size in bytes */
-    uint8_t     type;                 /* font family and style */
-    uint8_t     features;             /* format features and revision */
-    uint8_t     width;                /* overall width of the font */
-    uint8_t     height;               /* overall height of the font */
-    uint8_t     baseline;             /* horizontal baseline in grid pixels */
-    uint8_t     underline;            /* position of under line in grid pixels */
-    uint16_t    fragments_offs;       /* offset of fragments table */
-    uint32_t    characters_offs;      /* characters table offset */
-    uint32_t    ligature_offs;        /* ligatures table offset */
-    uint32_t    kerning_offs;         /* kerning table offset */
-    uint32_t    cmap_offs;            /* color map offset */
-} _pack ssfn_font_t;
-#ifdef _MSC_VER
-#pragma pack(pop)
-#endif
-
-/***** renderer API *****/
-#define SSFN_FAMILY_ANY      0xff     /* select the first loaded font */
-#define SSFN_FAMILY_BYNAME   0xfe     /* select font by its unique name */
-
-/* additional styles not stored in fonts */
-#define SSFN_STYLE_UNDERLINE   16     /* under line glyph */
-#define SSFN_STYLE_STHROUGH    32     /* strike through glyph */
-#define SSFN_STYLE_NOAA        64     /* no anti-aliasing */
-#define SSFN_STYLE_NOKERN     128     /* no kerning */
-#define SSFN_STYLE_NODEFGLYPH 256     /* don't draw default glyph */
-#define SSFN_STYLE_NOCACHE    512     /* don't cache rasterized glyph */
-#define SSFN_STYLE_NOHINTING 1024     /* no auto hinting grid (not used as of now) */
-#define SSFN_STYLE_RTL       2048     /* render right-to-left */
-#define SSFN_STYLE_ABS_SIZE  4096     /* scale absoulte height */
-#define SSFN_STYLE_NOSMOOTH  8192     /* no edge-smoothing for bitmaps */
-
-/* error codes */
-#define SSFN_OK                 0     /* success */
-#define SSFN_ERR_ALLOC         -1     /* allocation error */
-#define SSFN_ERR_BADFILE       -2     /* bad SSFN file format */
-#define SSFN_ERR_NOFACE        -3     /* no font face selected */
-#define SSFN_ERR_INVINP        -4     /* invalid input */
-#define SSFN_ERR_BADSTYLE      -5     /* bad style */
-#define SSFN_ERR_BADSIZE       -6     /* bad size */
-#define SSFN_ERR_NOGLYPH       -7     /* glyph (or kerning info) not found */
-
-#define SSFN_SIZE_MAX         192     /* biggest size we can render */
-#define SSFN_ITALIC_DIV         4     /* italic angle divisor, glyph top side pushed width / this pixels */
-#define SSFN_PREC               4     /* precision in bits */
-
-/* destination frame buffer context */
-typedef struct {
-    uint8_t *ptr;                     /* pointer to the buffer */
-    int w;                            /* width (positive: ARGB, negative: ABGR pixels) */
-    int h;                            /* height */
-    uint16_t p;                       /* pitch, bytes per line */
-    int x;                            /* cursor x */
-    int y;                            /* cursor y */
-    uint32_t fg;                      /* foreground color */
-    uint32_t bg;                      /* background color */
-} ssfn_buf_t;
-
-/* cached bitmap struct */
-#define SSFN_DATA_MAX       65536
-typedef struct {
-    uint16_t p;                       /* data buffer pitch, bytes per line */
-    uint8_t h;                        /* data buffer height */
-    uint8_t o;                        /* overlap of glyph, scaled to size */
-    uint8_t x;                        /* advance x, scaled to size */
-    uint8_t y;                        /* advance y, scaled to size */
-    uint8_t a;                        /* ascender, scaled to size */
-    uint8_t d;                        /* descender, scaled to size */
-    uint8_t data[SSFN_DATA_MAX];      /* data buffer */
-} ssfn_glyph_t;
-
-/* character metrics */
-typedef struct {
-    uint8_t t;                        /* type and overlap */
-    uint8_t n;                        /* number of fragments */
-    uint8_t w;                        /* width */
-    uint8_t h;                        /* height */
-    uint8_t x;                        /* advance x */
-    uint8_t y;                        /* advance y */
-} ssfn_chr_t;
-
-#ifdef SSFN_PROFILING
-#include <string.h>
-#include <sys/time.h>
-#endif
-
-/* renderer context */
-typedef struct {
-#ifdef SSFN_MAXLINES
-    const ssfn_font_t *fnt[5][16];    /* static font registry */
-#else
-    const ssfn_font_t **fnt[5];       /* dynamic font registry */
-#endif
-    const ssfn_font_t *s;             /* explicitly selected font */
-    const ssfn_font_t *f;             /* font selected by best match */
-    ssfn_glyph_t ga;                  /* glyph sketch area */
-    ssfn_glyph_t *g;                  /* current glyph pointer */
-#ifdef SSFN_MAXLINES
-    uint16_t p[SSFN_MAXLINES*2];
-#else
-    ssfn_glyph_t ***c[17];            /* glyph cache */
-    uint16_t *p;
-    char **bufs;                      /* allocated extra buffers */
-#endif
-    ssfn_chr_t *rc;                   /* pointer to current character */
-    int numbuf, lenbuf, np, ap, ox, oy, ax;
-    int mx, my, lx, ly;               /* move to coordinates, last coordinates */
-    int len[5];                       /* number of fonts in registry */
-    int family;                       /* required family */
-    int style;                        /* required style */
-    int size;                         /* required size */
-    int line;                         /* calculate line height */
-#ifdef SSFN_PROFILING
-    uint64_t lookup, raster, blit, kern;/* profiling accumulators */
-#endif
-} ssfn_t;
-
-/***** API function protoypes *****/
-
-uint32_t ssfn_utf8(char **str);                                                   /* decode UTF-8 sequence */
-
-/* normal renderer */
-int ssfn_load(ssfn_t *ctx, const void *data);                                     /* add an SSFN to context */
-int ssfn_select(ssfn_t *ctx, int family, const char *name, int style, int size);  /* select font to use */
-int ssfn_render(ssfn_t *ctx, ssfn_buf_t *dst, const char *str);                   /* render a glyph to a pixel buffer */
-int ssfn_bbox(ssfn_t *ctx, const char *str, int *w, int *h, int *left, int *top); /* get bounding box */
-ssfn_buf_t *ssfn_text(ssfn_t *ctx, const char *str, unsigned int fg);             /* renders text to a newly allocated buffer */
-int ssfn_mem(ssfn_t *ctx);                                                        /* return how much memory is used */
-void ssfn_free(ssfn_t *ctx);                                                      /* free context */
-#define ssfn_error(err) (err<0&&err>=-7?ssfn_errstr[-err]:"Unknown error")        /* return string for error code */
-extern const char *ssfn_errstr[];
-
-/* simple renderer */
-extern ssfn_font_t *ssfn_src;                                                     /* font buffer */
-extern ssfn_buf_t ssfn_dst;                                                       /* destination frame buffer */
-int ssfn_putc(uint32_t unicode);                                                  /* render console bitmap font */
-
-/***** renderer implementations *****/
-
-/*** these go for both renderers ***/
-#if (defined(SSFN_IMPLEMENTATION) || defined(SSFN_CONSOLEBITMAP_PALETTE) || \
-    defined(SSFN_CONSOLEBITMAP_HICOLOR) || defined(SSFN_CONSOLEBITMAP_TRUECOLOR)) && !defined(SSFN_COMMON)
-#define SSFN_COMMON
-
-/**
- * Error code strings
- */
-const char *ssfn_errstr[] = { "",
-    "Memory allocation error",
-    "Bad file format",
-    "No font face found",
-    "Invalid input value",
-    "Invalid style",
-    "Invalid size",
-    "Glyph not found"
-};
-
-/**
- * Decode an UTF-8 multibyte, advance string pointer and return UNICODE. Watch out, no input checks
- *
- * @param **s pointer to an UTF-8 string pointer
- * @return unicode, and *s moved to next multibyte sequence
- */
-uint32_t ssfn_utf8(char **s)
-{
-    uint32_t c = **s;
-
-    if((**s & 128) != 0) {
-        if(!(**s & 32)) { c = ((**s & 0x1F)<<6)|(*(*s+1) & 0x3F); *s += 1; } else
-        if(!(**s & 16)) { c = ((**s & 0xF)<<12)|((*(*s+1) & 0x3F)<<6)|(*(*s+2) & 0x3F); *s += 2; } else
-        if(!(**s & 8)) { c = ((**s & 0x7)<<18)|((*(*s+1) & 0x3F)<<12)|((*(*s+2) & 0x3F)<<6)|(*(*s+3) & 0x3F); *s += 3; }
-        else c = 0;
-    }
-    (*s)++;
-    return c;
-}
-#endif
-
-#ifdef SSFN_IMPLEMENTATION
-/*** normal renderer (ca. 28k, fully featured with error checking) ***/
-
-# ifndef NULL
-#  define NULL (void*)0
-# endif
-# ifndef size_t
-#  ifndef __SIZE_TYPE__
-#  define __SIZE_TYPE__ uint32_t
-#  endif
-   typedef __SIZE_TYPE__ size_t;
-# endif
-# ifndef inline
-#  ifdef _MSC_VER
-#   define inline __inline
-#  else
-#   define inline __inline__
-#  endif
-# endif
-
-#ifndef _STRING_H_
-extern int memcmp (const void *__s1, const void *__s2, size_t __n) __THROW;
-extern void *memset (void *__s, int __c, size_t __n) __THROW;
-#endif
-
-/* Clang does not have built-ins */
-# ifndef SSFN_memcmp
-#  ifdef __builtin_memcmp
-#   define SSFN_memcmp __builtin_memcmp
-#  else
-#   ifndef SSFN_MAXLINES
-#    define SSFN_memcmp memcmp
-#   else
-static int SSFN_memcmp(const void *__s1, const void *__s2, size_t __n)
-{   unsigned char *a = (unsigned char *)__s1, *b = (unsigned char *)__s2;
-    if(__n > 0) { while(__n-- > 0) { if(*a != *b) { return *a - *b; } a++; b++; } } return 0; }
-#   endif
-#  endif
-# endif
-
-# ifndef SSFN_memset
-#  ifdef __builtin_memset
-#   define SSFN_memset __builtin_memset
-#  else
-#   ifndef SSFN_MAXLINES
-#    define SSFN_memset memset
-#   else
-static void *SSFN_memset(void *__s, int __c, size_t __n)
-{ unsigned char *a = __s; if(__n > 0) { while(__n-- > 0) *a++ = __c; } return __s; }
-#   endif
-#  endif
-# endif
-
-# ifndef SSFN_MAXLINES
-
-#  ifndef SSFN_realloc
-#   ifdef __builtin_realloc
-#    define SSFN_realloc __builtin_realloc
-#   else
-#    define SSFN_realloc realloc
-     extern void *realloc (void *__ptr, size_t __size) __THROW;
-#   endif
-#  endif
-
-#  ifndef SSFN_free
-#   ifdef __builtin_free
-#    define SSFN_free __builtin_free
-#   else
-#    define SSFN_free free
-     extern void free (void *p) __THROW;
-#   endif
-#  endif
-
-# endif /* if !SSFN_MAXLINES */
-
-/*** Private functions ***/
-
-/* parse character table */
-static uint8_t *_ssfn_c(const ssfn_font_t *font, const char *str, int *len, uint32_t *unicode)
-{
-    uint32_t i, j, u = -1U;
-    uint16_t *l;
-    uint8_t *ptr, *s;
-
-    *len = 0; *unicode = 0;
-    if(!font || !font->characters_offs || !str || !*str) return NULL;
-
-    if(font->ligature_offs) {
-        for(l = (uint16_t*)((uint8_t*)font + font->ligature_offs), i = 0; l[i] && u == -1U; i++) {
-            for(ptr = (uint8_t*)font + l[i], s = (uint8_t*)str; *ptr && *ptr == *s; ptr++, s++);
-            if(!*ptr) { u = SSFN_LIG_FIRST + i; break; }
-        }
-    }
-    if(u == -1U) {
-        /* inline ssfn_utf8 to workaround -O2 bug in gcc 11.1 */
-        s = (uint8_t*)str; u = *s;
-        if((*s & 128) != 0) {
-            if(!(*s & 32)) { u = ((*s & 0x1F)<<6)|(*(s+1) & 0x3F); s++; } else
-            if(!(*s & 16)) { u = ((*s & 0xF)<<12)|((*(s+1) & 0x3F)<<6)|(*(s+2) & 0x3F); s += 2; } else
-            if(!(*s & 8)) { u = ((*s & 0x7)<<18)|((*(s+1) & 0x3F)<<12)|((*(s+2) & 0x3F)<<6)|(*(s+3) & 0x3F); s += 3; }
-            else u = 0;
-        }
-        s++;
-    }
-    *len = (int)(s - (uint8_t*)str);
-    *unicode = u;
-    for(ptr = (uint8_t*)font + font->characters_offs, i = 0; i < 0x110000; i++) {
-        if(ptr[0] == 0xFF) { i += 65535; ptr++; }
-        else if((ptr[0] & 0xC0) == 0xC0) { j = (((ptr[0] & 0x3F) << 8) | ptr[1]); i += j; ptr += 2; }
-        else if((ptr[0] & 0xC0) == 0x80) { j = (ptr[0] & 0x3F); i += j; ptr++; }
-        else {
-            if(i == u) return ptr;
-            ptr += 6 + ptr[1] * (ptr[0] & 0x40 ? 6 : 5);
-        }
-    }
-    return NULL;
-}
-
-/* add a line to contour */
-static void _ssfn_l(ssfn_t *ctx, int p, int h, int x, int y)
-{
-    if(x < 0 || y < 0 || x >= p || y >= h || (
-        ((ctx->lx + (1 << (SSFN_PREC-1))) >> SSFN_PREC) == ((x + (1 << (SSFN_PREC-1))) >> SSFN_PREC) &&
-        ((ctx->ly + (1 << (SSFN_PREC-1))) >> SSFN_PREC) == ((y + (1 << (SSFN_PREC-1))) >> SSFN_PREC))) return;
-#ifdef SSFN_MAXLINES
-    if(ctx->np >= SSFN_MAXLINES*2-2) return;
-#else
-    if(ctx->ap <= ctx->np) {
-        ctx->ap = ctx->np + 512;
-        ctx->p = (uint16_t*)SSFN_realloc(ctx->p, ctx->ap * sizeof(uint16_t));
-        if(!ctx->p) { ctx->ap = ctx->np = 0; return; }
-    }
-#endif
-    if(!ctx->np) {
-        ctx->p[0] = ctx->mx;
-        ctx->p[1] = ctx->my;
-        ctx->np += 2;
-    }
-    ctx->p[ctx->np+0] = x;
-    ctx->p[ctx->np+1] = y;
-    ctx->np += 2;
-    ctx->lx = x; ctx->ly = y;
-}
-
-/* add a Bezier curve to contour */
-static void _ssfn_b(ssfn_t *ctx, int p,int h, int x0,int y0, int x1,int y1, int x2,int y2, int x3,int y3, int l)
-{
-    int m0x, m0y, m1x, m1y, m2x, m2y, m3x, m3y, m4x, m4y,m5x, m5y;
-    if(l<4 && (x0!=x3 || y0!=y3)) {
-        m0x = ((x1-x0)/2) + x0;     m0y = ((y1-y0)/2) + y0;
-        m1x = ((x2-x1)/2) + x1;     m1y = ((y2-y1)/2) + y1;
-        m2x = ((x3-x2)/2) + x2;     m2y = ((y3-y2)/2) + y2;
-        m3x = ((m1x-m0x)/2) + m0x;  m3y = ((m1y-m0y)/2) + m0y;
-        m4x = ((m2x-m1x)/2) + m1x;  m4y = ((m2y-m1y)/2) + m1y;
-        m5x = ((m4x-m3x)/2) + m3x;  m5y = ((m4y-m3y)/2) + m3y;
-        _ssfn_b(ctx, p,h, x0,y0, m0x,m0y, m3x,m3y, m5x,m5y, l+1);
-        _ssfn_b(ctx, p,h, m5x,m5y, m4x,m4y, m2x,m2y, x3,y3, l+1);
-    }
-    if(l) _ssfn_l(ctx, p,h, x3, y3);
-}
-
-#ifndef SSFN_MAXLINES
-static void _ssfn_fc(ssfn_t *ctx)
-{
-    int i, j, k;
-    if(!ctx) return;
-    for(k = 0; k <= 16; k++)
-        if(ctx->c[k]) {
-            for(j = 0; j < 256; j++)
-                if(ctx->c[k][j]) {
-                    for(i = 0; i < 256; i++)
-                        if(ctx->c[k][j][i]) SSFN_free(ctx->c[k][j][i]);
-                    SSFN_free(ctx->c[k][j]);
-                }
-            SSFN_free(ctx->c[k]);
-            ctx->c[k] = NULL;
-        }
-}
-
-/*
- * gzip deflate uncompressor from stb_image.h with minor modifications to reduce dependency
- * stb_image - v2.23 - public domain image loader - http://nothings.org/stb_image.h
- */
-#define SSFN__ZFAST_BITS  9
-#define SSFN__ZFAST_MASK  ((1 << SSFN__ZFAST_BITS) - 1)
-
-typedef struct
-{
-   uint16_t fast[1 << SSFN__ZFAST_BITS];
-   uint16_t firstcode[16];
-   int maxcode[17];
-   uint16_t firstsymbol[16];
-   unsigned char  size[288];
-   uint16_t value[288];
-} _ssfn__zhuffman;
-
-inline static int _ssfn__bitreverse16(int n)
-{
-  n = ((n & 0xAAAA) >>  1) | ((n & 0x5555) << 1);
-  n = ((n & 0xCCCC) >>  2) | ((n & 0x3333) << 2);
-  n = ((n & 0xF0F0) >>  4) | ((n & 0x0F0F) << 4);
-  n = ((n & 0xFF00) >>  8) | ((n & 0x00FF) << 8);
-  return n;
-}
-
-inline static int _ssfn__bit_reverse(int v, int bits)
-{
-   return _ssfn__bitreverse16(v) >> (16-bits);
-}
-
-static int _ssfn__zbuild_huffman(_ssfn__zhuffman *z, unsigned char *sizelist, int num)
-{
-   int i,k=0;
-   int code, next_code[16], sizes[17];
-
-   SSFN_memset(sizes, 0, sizeof(sizes));
-   SSFN_memset(z->fast, 0, sizeof(z->fast));
-   for (i=0; i < num; ++i)
-      ++sizes[sizelist[i]];
-   sizes[0] = 0;
-   for (i=1; i < 16; ++i)
-      if (sizes[i] > (1 << i))
-         return 0;
-   code = 0;
-   for (i=1; i < 16; ++i) {
-      next_code[i] = code;
-      z->firstcode[i] = (uint16_t) code;
-      z->firstsymbol[i] = (uint16_t) k;
-      code = (code + sizes[i]);
-      if (sizes[i])
-         if (code-1 >= (1 << i)) return 0;
-      z->maxcode[i] = code << (16-i);
-      code <<= 1;
-      k += sizes[i];
-   }
-   z->maxcode[16] = 0x10000;
-   for (i=0; i < num; ++i) {
-      int s = sizelist[i];
-      if (s) {
-         int c = next_code[s] - z->firstcode[s] + z->firstsymbol[s];
-         uint16_t fastv = (uint16_t) ((s << 9) | i);
-         z->size [c] = (unsigned char) s;
-         z->value[c] = (uint16_t) i;
-         if (s <= SSFN__ZFAST_BITS) {
-            int j = _ssfn__bit_reverse(next_code[s],s);
-            while (j < (1 << SSFN__ZFAST_BITS)) {
-               z->fast[j] = fastv;
-               j += (1 << s);
-            }
-         }
-         ++next_code[s];
-      }
-   }
-   return 1;
-}
-
-typedef struct
-{
-   unsigned char *zbuffer;
-   int num_bits;
-   uint32_t code_buffer;
-
-   char *zout;
-   char *zout_start;
-   char *zout_end;
-
-   _ssfn__zhuffman z_length, z_distance;
-} _ssfn__zbuf;
-
-inline static unsigned char _ssfn__zget8(_ssfn__zbuf *z)
-{
-   return *z->zbuffer++;
-}
-
-static void _ssfn__fill_bits(_ssfn__zbuf *z)
-{
-   do {
-      z->code_buffer |= (unsigned int) _ssfn__zget8(z) << z->num_bits;
-      z->num_bits += 8;
-   } while (z->num_bits <= 24);
-}
-
-inline static unsigned int _ssfn__zreceive(_ssfn__zbuf *z, int n)
-{
-   unsigned int k;
-   if (z->num_bits < n) _ssfn__fill_bits(z);
-   k = z->code_buffer & ((1 << n) - 1);
-   z->code_buffer >>= n;
-   z->num_bits -= n;
-   return k;
-}
-
-static int _ssfn__zhuffman_decode_slowpath(_ssfn__zbuf *a, _ssfn__zhuffman *z)
-{
-   int b,s,k;
-   k = _ssfn__bit_reverse(a->code_buffer, 16);
-   for (s=SSFN__ZFAST_BITS+1; ; ++s)
-      if (k < z->maxcode[s])
-         break;
-   if (s == 16) return -1;
-   b = (k >> (16-s)) - z->firstcode[s] + z->firstsymbol[s];
-   a->code_buffer >>= s;
-   a->num_bits -= s;
-   return z->value[b];
-}
-
-inline static int _ssfn__zhuffman_decode(_ssfn__zbuf *a, _ssfn__zhuffman *z)
-{
-   int b,s;
-   if (a->num_bits < 16) _ssfn__fill_bits(a);
-   b = z->fast[a->code_buffer & SSFN__ZFAST_MASK];
-   if (b) {
-      s = b >> 9;
-      a->code_buffer >>= s;
-      a->num_bits -= s;
-      return b & 511;
-   }
-   return _ssfn__zhuffman_decode_slowpath(a, z);
-}
-
-static int _ssfn__zexpand(_ssfn__zbuf *z, char *zout)
-{
-   char *q;
-   unsigned int cur, limit;
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wuse-after-free"
-#endif
-   z->zout = zout; cur = (unsigned int) (z->zout - z->zout_start); limit = (unsigned int) (z->zout_end - z->zout_start);
-   if(limit == 8) { if(z->zout_start[0] != 'S' || z->zout_start[1] != 'F' || z->zout_start[2] != 'N') return 0; limit = *((uint32_t*)&z->zout_start[4]); } else return 0;
-   q = (char *) SSFN_realloc(z->zout_start, limit);
-   if (q == NULL) return 0;
-   z->zout_start = q; z->zout = q + cur; z->zout_end = q + limit;
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-   return 1;
-}
-
-static int _ssfn__zlength_base[31]={3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,0,0};
-static int _ssfn__zlength_extra[31]={0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,0,0};
-static int _ssfn__zdist_base[32]={1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0};
-static int _ssfn__zdist_extra[32]={0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
-
-static int _ssfn__parse_huffman_block(_ssfn__zbuf *a)
-{
-   char *zout = a->zout;
-   for(;;) {
-      int z = _ssfn__zhuffman_decode(a, &a->z_length);
-      if (z < 256) {
-         if (z < 0) return 0;
-         if (zout >= a->zout_end) { if (!_ssfn__zexpand(a, zout)) return 0; zout = a->zout; }
-         *zout++ = (char) z;
-      } else {
-         unsigned char *p;
-         int len,dist;
-         if (z == 256) { a->zout = zout; return 1; }
-         z -= 257;
-         len = _ssfn__zlength_base[z];
-         if (_ssfn__zlength_extra[z]) len += _ssfn__zreceive(a, _ssfn__zlength_extra[z]);
-         z = _ssfn__zhuffman_decode(a, &a->z_distance);
-         if (z < 0) return 0;
-         dist = _ssfn__zdist_base[z];
-         if (_ssfn__zdist_extra[z]) dist += _ssfn__zreceive(a, _ssfn__zdist_extra[z]);
-         if (zout - a->zout_start < dist) return 0;
-         if (zout + len > a->zout_end) {
-            if (!_ssfn__zexpand(a, zout)) return 0;
-            zout = a->zout;
-         }
-         p = (unsigned char *) (zout - dist);
-         if (dist == 1) {unsigned char v = *p;if (len) { do *zout++ = v; while (--len); }
-         } else { if (len) { do *zout++ = *p++; while (--len); } }
-      }
-   }
-}
-
-static int _ssfn__compute_huffman_codes(_ssfn__zbuf *a)
-{
-   static unsigned char length_dezigzag[19] = { 16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15 };
-   _ssfn__zhuffman z_codelength;
-   unsigned char lencodes[286+32+137];
-   unsigned char codelength_sizes[19];
-   int i,n;
-
-   int hlit  = _ssfn__zreceive(a,5) + 257;
-   int hdist = _ssfn__zreceive(a,5) + 1;
-   int hclen = _ssfn__zreceive(a,4) + 4;
-   int ntot  = hlit + hdist;
-
-   SSFN_memset(codelength_sizes, 0, sizeof(codelength_sizes));
-   for (i=0; i < hclen; ++i) {
-      int s = _ssfn__zreceive(a,3);
-      codelength_sizes[length_dezigzag[i]] = (unsigned char) s;
-   }
-   if (!_ssfn__zbuild_huffman(&z_codelength, codelength_sizes, 19)) return 0;
-
-   n = 0;
-   while (n < ntot) {
-      int c = _ssfn__zhuffman_decode(a, &z_codelength);
-      if (c < 0 || c >= 19) return 0;
-      if (c < 16)
-         lencodes[n++] = (unsigned char) c;
-      else {
-         unsigned char fill = 0;
-         if (c == 16) {
-            c = _ssfn__zreceive(a,2)+3;
-            if (n == 0) return 0;
-            fill = lencodes[n-1];
-         } else
-         if (c == 17) c = _ssfn__zreceive(a,3)+3;
-         else { c = _ssfn__zreceive(a,7)+11; }
-         if (ntot - n < c) return 0;
-         SSFN_memset(lencodes+n, fill, c);
-         n += c;
-      }
-   }
-   if (n != ntot) return 0;
-   if (!_ssfn__zbuild_huffman(&a->z_length, lencodes, hlit)) return 0;
-   if (!_ssfn__zbuild_huffman(&a->z_distance, lencodes+hlit, hdist)) return 0;
-   return 1;
-}
-
-inline static int _ssfn__parse_uncompressed_block(_ssfn__zbuf *a)
-{
-   unsigned char header[4];
-   int len,nlen,k;
-   if (a->num_bits & 7)
-      _ssfn__zreceive(a, a->num_bits & 7);
-   k = 0;
-   while (a->num_bits > 0) {
-      header[k++] = (unsigned char) (a->code_buffer & 255);
-      a->code_buffer >>= 8;
-      a->num_bits -= 8;
-   }
-   while (k < 4)
-      header[k++] = _ssfn__zget8(a);
-   len  = header[1] * 256 + header[0];
-   nlen = header[3] * 256 + header[2];
-   if (nlen != (len ^ 0xffff)) return 0;
-   if (a->zout + len > a->zout_end)
-      if (!_ssfn__zexpand(a, a->zout)) return 0;
-   for(k = 0; k < len; k++)
-       a->zout[k] = a->zbuffer[k];
-   a->zbuffer += len;
-   a->zout += len;
-   return 1;
-}
-
-static unsigned char _ssfn__zdefault_length[288], _ssfn__zdefault_distance[32];
-static void _ssfn__init_zdefaults(void)
-{
-   int i;
-   for (i=0; i <= 143; ++i) _ssfn__zdefault_length[i] = 8;
-   for (   ; i <= 255; ++i) _ssfn__zdefault_length[i] = 9;
-   for (   ; i <= 279; ++i) _ssfn__zdefault_length[i] = 7;
-   for (   ; i <= 287; ++i) _ssfn__zdefault_length[i] = 8;
-
-   for (i=0; i <=  31; ++i) _ssfn__zdefault_distance[i] = 5;
-}
-
-static int _ssfn__parse_zlib(_ssfn__zbuf *a)
-{
-   int fin, type;
-   a->num_bits = 0;
-   a->code_buffer = 0;
-   do {
-      fin = _ssfn__zreceive(a,1);
-      type = _ssfn__zreceive(a,2);
-      if (type == 0) { if (!_ssfn__parse_uncompressed_block(a)) return 0; }
-      else if (type == 3) { return 0; }
-      else {
-         if (type == 1) {
-            if (!_ssfn__zbuild_huffman(&a->z_length  , _ssfn__zdefault_length  , 288)) return 0;
-            if (!_ssfn__zbuild_huffman(&a->z_distance, _ssfn__zdefault_distance,  32)) return 0;
-         } else {
-            if (!_ssfn__compute_huffman_codes(a)) return 0;
-         }
-         if (!_ssfn__parse_huffman_block(a)) return 0;
-      }
-   } while (!fin);
-   return 1;
-}
-
-char *_ssfn_zlib_decode(const char *buffer)
-{
-   _ssfn__zbuf a;
-   char *p = (char *) SSFN_realloc(NULL, 8);
-   if (p == NULL) return NULL;
-   a.zbuffer = (unsigned char *) buffer;
-   a.zout_start = p; a.zout = p; a.zout_end = p + 8;
-   _ssfn__init_zdefaults();
-   if (_ssfn__parse_zlib(&a)) { return a.zout_start; } else { SSFN_free(a.zout_start); return NULL; }
-}
-#endif /* if !SSFN_MAXLINES */
-
-/*** Public API implementation ***/
-
-/**
- * Load a font or font collection into renderer context
- *
- * @param ctx rendering context
- * @param font SSFN font or font collection in memory
- * @return error code
- */
-int ssfn_load(ssfn_t *ctx, const void *data)
-{
-    const ssfn_font_t *font = (const ssfn_font_t *)data;
-    ssfn_font_t *fnt, *end;
-    int family;
-#ifndef SSFN_MAXLINES
-    uint8_t c, r, *ptr = (uint8_t *)font;
-#endif
-    if(!ctx || !font)
-        return SSFN_ERR_INVINP;
-    if(((uint8_t *)font)[0] == 0x1f && ((uint8_t *)font)[1] == 0x8b) {
-#ifdef SSFN_MAXLINES
-        return SSFN_ERR_BADFILE;
-#else
-        ptr += 2;
-        if(*ptr++ != 8) return SSFN_ERR_BADFILE;
-        c = *ptr++; ptr += 6;
-        if(c & 4) { r = *ptr++; r += (*ptr++ << 8); ptr += r; }
-        if(c & 8) { while(*ptr++ != 0); }
-        if(c & 16) { while(*ptr++ != 0); }
-        font = (ssfn_font_t*)_ssfn_zlib_decode((const char*)ptr);
-        if(!font) return SSFN_ERR_BADFILE;
-        ctx->bufs = (char**)SSFN_realloc(ctx->bufs, (ctx->numbuf + 1) * sizeof(char*));
-        if(!ctx->bufs) { ctx->numbuf = 0; return SSFN_ERR_ALLOC; }
-        ctx->bufs[ctx->numbuf++] = (char*)font;
-        ctx->lenbuf += font->size;
-#endif
-    }
-    if(!SSFN_memcmp(font->magic, SSFN_COLLECTION, 4)) {
-        end = (ssfn_font_t*)((uint8_t*)font + font->size);
-        for(fnt = (ssfn_font_t*)((uint8_t*)font + 8); fnt < end && !ssfn_load(ctx, (const void *)fnt);
-            fnt = (ssfn_font_t*)((uint8_t*)fnt + fnt->size));
-    } else {
-        family = SSFN_TYPE_FAMILY(font->type);
-        if(SSFN_memcmp(font->magic, SSFN_MAGIC, 4) || SSFN_memcmp((uint8_t*)font + font->size - 4, SSFN_ENDMAGIC, 4) ||
-            family > SSFN_FAMILY_HAND || font->fragments_offs >= font->size || font->characters_offs >= font->size ||
-            font->ligature_offs >= font->size || font->kerning_offs >= font->size || font->cmap_offs >= font->size ||
-            font->fragments_offs >= font->characters_offs) {
-                return SSFN_ERR_BADFILE;
-        } else {
-            ctx->len[family]++;
-#ifdef SSFN_MAXLINES
-            if(ctx->len[family] > 15) return SSFN_ERR_ALLOC;
-#else
-            ctx->fnt[family] = (const ssfn_font_t**)SSFN_realloc(ctx->fnt[family], ctx->len[family]*sizeof(void*));
-            if(!ctx->fnt[family]) {
-                ctx->len[family] = 0;
-                return SSFN_ERR_ALLOC;
-            } else
-#endif
-                ctx->fnt[family][ctx->len[family]-1] = font;
-        }
-#ifndef SSFN_MAXLINES
-        _ssfn_fc(ctx);
-#endif
-    }
-    return SSFN_OK;
-}
-
-/**
- * Free renderer context
- *
- * @param ctx rendering context
- */
-void ssfn_free(ssfn_t *ctx)
-{
-#ifndef SSFN_MAXLINES
-    int i;
-#endif
-    if(!ctx) return;
-#ifndef SSFN_MAXLINES
-    _ssfn_fc(ctx);
-    if(ctx->bufs) {
-        for(i = 0; i < ctx->numbuf; i++)
-            if(ctx->bufs[i]) SSFN_free(ctx->bufs[i]);
-        SSFN_free(ctx->bufs);
-    }
-    for(i = 0; i < 5; i++)
-        if(ctx->fnt[i]) SSFN_free(ctx->fnt[i]);
-    if(ctx->p) SSFN_free(ctx->p);
-#endif
-    SSFN_memset(ctx, 0, sizeof(ssfn_t));
-}
-
-/**
- * Returns how much memory a context consumes
- *
- * @param ctx rendering context
- * @return total memory used by that context in bytes
- */
-int ssfn_mem(ssfn_t *ctx)
-{
-#ifdef SSFN_MAXLINES
-    return ctx ? sizeof(ssfn_t) : 0;
-#else
-    int i, j, k, ret = sizeof(ssfn_t);
-
-    if(!ctx) return 0;
-    for(i = 0; i < 5; i++) ret += ctx->len[i] * sizeof(ssfn_font_t*);
-    ret += ctx->lenbuf;
-    for(k = 0; k <= 16; k++) {
-        if(ctx->c[k]) {
-            for(j = 0; j < 256; j++)
-                if(ctx->c[k][j]) {
-                    for(i = 0; i < 256; i++)
-                        if(ctx->c[k][j][i]) ret += 8 + ctx->c[k][j][i]->p * ctx->c[k][j][i]->h;
-                    ret += 256 * sizeof(void*);
-                }
-            ret += 256 * sizeof(void*);
-        }
-    }
-    if(ctx->p) ret += ctx->ap * sizeof(uint16_t);
-    return ret;
-#endif
-}
-
-/**
- * Set up rendering parameters
- *
- * @param ctx rendering context
- * @param family one of SSFN_FAMILY_*
- * @param name NULL or UTF-8 string if family is SSFN_FAMILY_BYNAME
- * @param style OR'd values of SSFN_STYLE_*
- * @param size how big glyph it should render, 8 - 192
- * @return error code
- */
-int ssfn_select(ssfn_t *ctx, int family, const char *name, int style, int size)
-{
-    int i, j, l;
-
-    if(!ctx) return SSFN_ERR_INVINP;
-#ifndef SSFN_MAXLINES
-    _ssfn_fc(ctx);
-#endif
-    if((style & ~0x5FFF)) return SSFN_ERR_BADSTYLE;
-    if(size < 8 || size > SSFN_SIZE_MAX) return SSFN_ERR_BADSIZE;
-
-    if(family == SSFN_FAMILY_BYNAME) {
-        if(!name || !name[0]) return SSFN_ERR_INVINP;
-        for(l=0; name[l]; l++);
-        for(i=0; i < 5; i++) {
-            for(j=0; j < ctx->len[i]; j++) {
-                if(!SSFN_memcmp(name, (uint8_t*)&ctx->fnt[i][j]->magic + sizeof(ssfn_font_t), l)) {
-                    ctx->s = ctx->fnt[i][j];
-                    goto familyfound;
-                }
-            }
-        }
-        return SSFN_ERR_NOFACE;
-    } else {
-        if(family != SSFN_FAMILY_ANY && (family > SSFN_FAMILY_HAND || !ctx->len[family])) return SSFN_ERR_NOFACE;
-        ctx->s = NULL;
-    }
-familyfound:
-    ctx->f = NULL;
-    ctx->family = family;
-    ctx->style = style;
-    ctx->size = size;
-    ctx->line = 0;
-    return SSFN_OK;
-}
-
-/**
- * Render a glyph to a pixel buffer
- *
- * @param ctx rendering context
- * @param dst destination buffer
- * @param str pointer to an UTF-8 string
- * @return number of bytes parsed in str (zero means end of string) or error code
- */
-
-int ssfn_render(ssfn_t *ctx, ssfn_buf_t *dst, const char *str)
-{
-    ssfn_font_t **fl;
-    uint8_t *ptr = NULL, *frg, *end, *tmp, color, ci = 0, cb = 0, cs, dec[65536];
-    uint16_t r[640];
-    uint32_t unicode, P, O, *Op, *Ol, sR, sG, sB, sA, bA;
-    int ret = 0, i, j, k, l, p, m, n, o, s, x, y, w, h, H, a, A, b, B, nr, uix, uax;
-    int ox, oy, y0, y1, Y0, Y1, x0, x1, X0, X1, X2, xs, ys, yp, pc, fB, fG, fR, fA, bB, bG, bR, dB, dG, dR, dA;
-#ifdef SSFN_PROFILING
-    struct timeval tv0, tv1, tvd;
-    gettimeofday(&tv0, NULL);
-#endif
-#define PUTPIXEL  O = *Ol;bR = (O >> (16 - cs)) & 0xFF; bG = (O >> 8) & 0xFF; bB = (O >> cs) & 0xFF; bA = (O >> 24) & 0xFF;\
-    bB += ((fB - bB) * fA) >> 8; bG += ((fG - bG) * fA) >> 8; bR += ((fR - bR) * fA) >> 8; bA += ((fA - bA) * fA) >> 8;\
-    *Ol = (bA << 24) | (bR << (16 - cs)) | (bG << 8) | (bB << cs);
-
-    if(!ctx || !str) return SSFN_ERR_INVINP;
-    if(!*str) return 0;
-    if(*str == '\r') { dst->x = 0; return 1; }
-    if(*str == '\n') { dst->x = 0; dst->y += ctx->line ? ctx->line : ctx->size; return 1; }
-
-    if(ctx->s) {
-        ctx->f = ctx->s;
-        ptr = _ssfn_c(ctx->f, str, &ret, &unicode);
-    } else {
-        /* find best match */
-        p = ctx->family;
-        ctx->f = NULL;
-again:  if(p >= SSFN_FAMILY_BYNAME) { n = 0; m = 4; } else n = m = p;
-        for(; n <= m; n++) {
-            fl = (ssfn_font_t **)ctx->fnt[n];
-            if(ctx->style & 3) {
-                /* check if we have a specific ctx->f for the requested style and size */
-                for(i=0;i<ctx->len[n];i++)
-                    if(((fl[i]->type>>4) & 3) == (ctx->style & 3) && fl[i]->height == ctx->size &&
-                        (ptr = _ssfn_c(fl[i], str, &ret, &unicode))) { ctx->f = fl[i]; break; }
-                /* if not, check if we have the requested size (for bitmap fonts) */
-                if(!ptr)
-                    for(i=0;i<ctx->len[n];i++)
-                        if(fl[i]->height == ctx->size && (ptr = _ssfn_c(fl[i], str, &ret, &unicode))) { ctx->f = fl[i]; break; }
-                /* if neither size+style nor size matched, look for style match */
-                if(!ptr)
-                    for(i=0;i<ctx->len[n];i++)
-                        if(((fl[i]->type>>4) & 3) == (ctx->style & 3) && (ptr = _ssfn_c(fl[i], str, &ret, &unicode)))
-                            { ctx->f = fl[i]; break; }
-                /* if bold italic was requested, check if we have at least bold or italic */
-                if(!ptr && (ctx->style & 3) == 3)
-                    for(i=0;i<ctx->len[n];i++)
-                        if(((fl[i]->type>>4) & 3) && (ptr = _ssfn_c(fl[i], str, &ret, &unicode))) { ctx->f = fl[i]; break; }
-            }
-            /* last resort, get the first ctx->f which has a glyph for this multibyte, no matter style */
-            if(!ptr) {
-                for(i=0;i<ctx->len[n];i++)
-                    if((ptr = _ssfn_c(fl[i], str, &ret, &unicode))) { ctx->f = fl[i]; break; }
-            }
-        }
-        /* if glyph still not found, try any family group */
-        if(!ptr && p != SSFN_FAMILY_ANY) { p = SSFN_FAMILY_ANY; goto again; }
-    }
-    if(!ptr) {
-        if(ctx->style & SSFN_STYLE_NODEFGLYPH) return SSFN_ERR_NOGLYPH;
-        else {
-            unicode = 0;
-            if(ctx->family >= SSFN_FAMILY_BYNAME) { n = 0; m = 4; } else n = m = ctx->family;
-            for(; n <= m && !ptr; n++)
-                if(ctx->len[n] && ctx->fnt[n][0] && !(*((uint8_t*)ctx->fnt[n][0] + ctx->fnt[n][0]->characters_offs) & 0x80))
-                    { ctx->f = ctx->fnt[n][0]; ptr = (uint8_t*)ctx->f + ctx->f->characters_offs; }
-        }
-        if(!ptr) return SSFN_ERR_NOGLYPH;
-    }
-    if(!ctx->f || !ctx->f->height || !ctx->size) return SSFN_ERR_NOFACE;
-    if((unicode >> 16) > 0x10) return SSFN_ERR_INVINP;
-    ctx->rc = (ssfn_chr_t*)ptr; ptr += sizeof(ssfn_chr_t);
-    H = (ctx->style & SSFN_STYLE_ABS_SIZE) || SSFN_TYPE_FAMILY(ctx->f->type) == SSFN_FAMILY_MONOSPACE || !ctx->f->baseline ?
-        ctx->size : ctx->size * ctx->f->height / ctx->f->baseline;
-
-#ifdef SSFN_PROFILING
-    gettimeofday(&tv1, NULL); tvd.tv_sec = tv1.tv_sec - tv0.tv_sec; tvd.tv_usec = tv1.tv_usec - tv0.tv_usec;
-    if(tvd.tv_usec < 0) { tvd.tv_sec--; tvd.tv_usec += 1000000L; }
-    ctx->lookup += tvd.tv_sec * 1000000L + tvd.tv_usec;
-    memcpy(&tv0, &tv1, sizeof(struct timeval));
-#endif
-    /* render glyph into cache */
-#ifndef SSFN_MAXLINES
-    if(!(ctx->style & SSFN_STYLE_NOCACHE) && ctx->c[unicode >> 16] && ctx->c[unicode >> 16][(unicode >> 8) & 0xFF] &&
-        ctx->c[unicode >> 16][(unicode >> 8) & 0xFF][unicode & 0xFF]) {
-            ctx->g = ctx->c[unicode >> 16][(unicode >> 8) & 0xFF][unicode & 0xFF];
-    } else
-#endif
-    {
-        h = ctx->style & SSFN_STYLE_NOAA ? H : (ctx->size > ctx->f->height ? (ctx->size + 4) & ~3 : ctx->f->height);
-        ci = (ctx->style & SSFN_STYLE_ITALIC) && !(SSFN_TYPE_STYLE(ctx->f->type) & SSFN_STYLE_ITALIC);
-        cb = (ctx->style & SSFN_STYLE_BOLD) && !(SSFN_TYPE_STYLE(ctx->f->type) & SSFN_STYLE_BOLD) ? (ctx->f->height+64)>>6 : 0;
-        w = (ctx->rc->w * h + ctx->f->height - 1) / ctx->f->height;
-        if(w > SSFN_SIZE_MAX) { h = h * SSFN_SIZE_MAX / w; w = SSFN_SIZE_MAX; }
-        p = w + (ci ? h / SSFN_ITALIC_DIV : 0) + cb;
-        /* failsafe, should never happen */
-        if(p * h >= SSFN_DATA_MAX) return SSFN_ERR_BADSIZE;
-#ifndef SSFN_MAXLINES
-        if(!(ctx->style & SSFN_STYLE_NOCACHE)) {
-            if(!ctx->c[unicode >> 16]) {
-                ctx->c[unicode >> 16] = (ssfn_glyph_t***)SSFN_realloc(NULL, 256 * sizeof(void*));
-                if(!ctx->c[unicode >> 16]) return SSFN_ERR_ALLOC;
-                SSFN_memset(ctx->c[unicode >> 16], 0, 256 * sizeof(void*));
-            }
-            if(!ctx->c[unicode >> 16][(unicode >> 8) & 0xFF]) {
-                ctx->c[unicode >> 16][(unicode >> 8) & 0xFF] = (ssfn_glyph_t**)SSFN_realloc(NULL, 256 * sizeof(void*));
-                if(!ctx->c[unicode >> 16][(unicode >> 8) & 0xFF]) return SSFN_ERR_ALLOC;
-                SSFN_memset(ctx->c[unicode >> 16][(unicode >> 8) & 0xFF], 0, 256 * sizeof(void*));
-            }
-            ctx->g = ctx->c[unicode >> 16][(unicode >> 8) & 0xFF][unicode & 0xFF] = (ssfn_glyph_t*)SSFN_realloc(NULL, p * h + 8);
-            if(!ctx->c[unicode >> 16][(unicode >> 8) & 0xFF][unicode & 0xFF]) return SSFN_ERR_ALLOC;
-        } else
-#endif
-            ctx->g = &ctx->ga;
-        x = (ctx->rc->x > 0 && ci ? (ctx->f->height - ctx->f->baseline) * h / SSFN_ITALIC_DIV / ctx->f->height : 0);
-        ctx->g->p = p;
-        ctx->g->h = h;
-        ctx->g->x = (ctx->rc->x + x > 255 ? 255 : ctx->rc->x + x);
-        ctx->g->y = ctx->rc->y;
-        ctx->g->o = (ctx->rc->t & 0x3F) + x;
-        SSFN_memset(&ctx->g->data, 0xFF, p * h);
-        color = 0xFE; ctx->g->a = ctx->g->d = 0;
-        for(n = 0; n < ctx->rc->n; n++) {
-            if(ptr[0] == 255 && ptr[1] == 255) { color = ptr[2]; ptr += ctx->rc->t & 0x40 ? 6 : 5; continue; }
-            x = ((ptr[0] + cb) << SSFN_PREC) * h / ctx->f->height; y = (ptr[1] << SSFN_PREC) * h / ctx->f->height;
-            if(ctx->rc->t & 0x40) { m = (ptr[5] << 24) | (ptr[4] << 16) | (ptr[3] << 8) | ptr[2]; ptr += 6; }
-            else { m = (ptr[4] << 16) | (ptr[3] << 8) | ptr[2]; ptr += 5; }
-            frg = (uint8_t*)ctx->f +  m;
-            if(!(frg[0] & 0x80)) {
-                /* contour */
-                j = (frg[0] & 0x3F);
-                if(frg[0] & 0x40) { j <<= 8; j |= frg[1]; frg++; }
-                j++; frg++; tmp = frg; frg += (j+3)/4; ctx->np = 0;
-                for(i = 0; i < j; i++) {
-                    k = (frg[0] << SSFN_PREC) * h / ctx->f->height + x; m = (frg[1] << SSFN_PREC) * h / ctx->f->height + y;
-                    switch((tmp[i >> 2] >> ((i & 3) << 1)) & 3) {
-                        case SSFN_CONTOUR_MOVE: ctx->mx = ctx->lx = k; ctx->my = ctx->ly = m; frg += 2; break;
-                        case SSFN_CONTOUR_LINE: _ssfn_l(ctx, p << SSFN_PREC, h << SSFN_PREC, k, m); frg += 2; break;
-                        case SSFN_CONTOUR_QUAD:
-                            a = (frg[2] << SSFN_PREC) * h / ctx->f->height + x; A = (frg[3] << SSFN_PREC) * h / ctx->f->height + y;
-                            _ssfn_b(ctx, p << SSFN_PREC,h << SSFN_PREC, ctx->lx,ctx->ly, ((a-ctx->lx)/2)+ctx->lx,
-                                ((A-ctx->ly)/2)+ctx->ly, ((k-a)/2)+a,((A-m)/2)+m, k,m, 0);
-                            frg += 4;
-                        break;
-                        case SSFN_CONTOUR_CUBIC:
-                            a = (frg[2] << SSFN_PREC) * h / ctx->f->height + x; A = (frg[3] << SSFN_PREC) * h / ctx->f->height + y;
-                            b = (frg[4] << SSFN_PREC) * h / ctx->f->height + x; B = (frg[5] << SSFN_PREC) * h / ctx->f->height + y;
-                            _ssfn_b(ctx, p << SSFN_PREC,h << SSFN_PREC, ctx->lx,ctx->ly, a,A, b,B, k,m, 0);
-                            frg += 6;
-                        break;
-                    }
-                }
-                /* close path */
-                if(ctx->mx != ctx->lx || ctx->my != ctx->ly) { ctx->p[ctx->np+0] = ctx->mx; ctx->p[ctx->np+1] = ctx->my; ctx->np += 2; }
-                /* add rasterized vector layers to cached glyph */
-                if(ctx->np > 4) {
-                    for(b = A = B = o = 0; b < h; b++, B += p) {
-                        a = b << SSFN_PREC;
-                        for(nr = 0, i = 0; i < ctx->np - 3; i += 2) {
-                            if( (ctx->p[i+1] < a && ctx->p[i+3] >= a) ||
-                                (ctx->p[i+3] < a && ctx->p[i+1] >= a)) {
-                                    if((ctx->p[i+1] >> SSFN_PREC) == (ctx->p[i+3] >> SSFN_PREC))
-                                        x = (((int)ctx->p[i]+(int)ctx->p[i+2])>>1);
-                                    else
-                                        x = ((int)ctx->p[i]) + ((a - (int)ctx->p[i+1])*
-                                            ((int)ctx->p[i+2] - (int)ctx->p[i])/
-                                            ((int)ctx->p[i+3] - (int)ctx->p[i+1]));
-                                    x >>= SSFN_PREC;
-                                    if(ci) x += (h - b) / SSFN_ITALIC_DIV;
-                                    if(cb && !o) {
-                                        if(ctx->g->data[B + x] != color) { o = -cb; A = cb; }
-                                        else { o = cb; A = -cb; }
-                                    }
-                                    for(k = 0; k < nr && x > r[k]; k++);
-                                    for(l = nr; l > k; l--) r[l] = r[l-1];
-                                    r[k] = x;
-                                    nr++;
-                            }
-                        }
-                        if(nr > 1 && nr & 1) { r[nr - 2] = r[nr - 1]; nr--; }
-                        if(nr) {
-                            if(ctx->g->d < y + b) ctx->g->d = y + b;
-                            for(i = 0; i < nr - 1; i += 2) {
-                                l = r[i] + o; m = r[i + 1] + A;
-                                if(l < 0) l = 0;
-                                if(m > p) m = p;
-                                if(i > 0 && l < r[i - 1] + A) l = r[i - 1] + A;
-                                for(; l < m; l++)
-                                    ctx->g->data[B + l] = ctx->g->data[B + l] == color ? 0xFF : color;
-                            }
-                        }
-                    }
-                }
-            } else if((frg[0] & 0x60) == 0x00) {
-                /* bitmap */
-                B = ((frg[0] & 0x1F) + 1) << 3; A = frg[1] + 1; x >>= SSFN_PREC; y >>= SSFN_PREC;
-                b = B * h / ctx->f->height; a = A * h / ctx->f->height;
-                if(ctx->g->d < y + a) ctx->g->d = y + a;
-                frg += 2;
-                for(j = 0; j < a; j++) {
-                    k = j * A / a;
-                    l = (y + j) * p + x + (ci ? (h - y - j) / SSFN_ITALIC_DIV : 0);
-                    for(i = 0; i < b; i++) {
-                        m = i * B / b;
-                        if(frg[(k * B + m) >> 3] & (1 << (m & 7))) {
-                            for(o = 0; o <= cb; o++)
-                                ctx->g->data[l + i + o] = color;
-                        }
-                    }
-                }
-                if(!(ctx->style & (SSFN_STYLE_NOAA|SSFN_STYLE_NOSMOOTH))) {
-                    m = color == 0xFD ? 0xFC : 0xFD; o = y * p + p + x;
-                    for(k = h; k > ctx->f->height + 4; k -= 2*ctx->f->height) {
-                        for(j = 1, l = o; j < a - 1; j++, l += p)
-                            for(i = 1; i < b - 1; i++) {
-                                if(ctx->g->data[l + i] == 0xFF && (ctx->g->data[l + i - p] == color ||
-                                    ctx->g->data[l + i + p] == color) && (ctx->g->data[l + i - 1] == color ||
-                                    ctx->g->data[l + i + 1] == color)) ctx->g->data[l + i] = m;
-                            }
-                        for(j = 1, l = o; j < a - 1; j++, l += p)
-                            for(i = 1; i < b - 1; i++) {
-                                if(ctx->g->data[l + i] == m) ctx->g->data[l + i] = color;
-                            }
-                    }
-                }
-            } else if((frg[0] & 0x60) == 0x20) {
-                /* pixmap */
-                k = (((frg[0] & 0x1F) << 8) | frg[1]) + 1; B = frg[2] + 1; A = frg[3] + 1; x >>= SSFN_PREC; y >>= SSFN_PREC;
-                b = B * h / ctx->f->height; a = A * h / ctx->f->height;
-                if(ctx->g->d < y + a) ctx->g->d = y + a;
-                frg += 4; end = frg + k; i = 0;
-                while(frg < end) {
-                    l = ((*frg++) & 0x7F) + 1;
-                    if(frg[-1] & 0x80) {
-                        while(l--) dec[i++] = *frg;
-                        frg++;
-                    } else while(l--) dec[i++] = *frg++;
-                }
-                for(j = 0; j < a; j++) {
-                    k = j * A / a * B;
-                    l = (y + j) * p + x + (ci ? (h - y - j) / SSFN_ITALIC_DIV : 0);
-                    for(i = 0; i < b; i++) {
-                        m = dec[k + i * B / b];
-                        if(m != 0xFF) ctx->g->data[l + i] = m;
-                    }
-                }
-            }
-            color = 0xFE;
-        }
-        ctx->g->a = ctx->f->baseline;
-        if(ctx->g->d > ctx->g->a + 1) ctx->g->d -= ctx->g->a + 1; else ctx->g->d = 0;
-#ifdef SSFN_DEBUGGLYPH
-        printf("\nU+%06X size %d p %d h %d base %d under %d overlap %d ascender %d descender %d advance x %d advance y %d cb %d\n",
-            unicode, ctx->size,p,h,ctx->f->baseline,ctx->f->underline,ctx->g->o,ctx->g->a,ctx->g->d,ctx->g->x,ctx->g->y,cb);
-        for(j = 0; j < h; j++) { printf("%3d: ", j); for(i = 0; i < p; i++) { if(ctx->g->data[j*p+i] == 0xFF) printf(j == ctx->g->a ? "_" : "."); else printf("%x", ctx->g->data[j*p+i] & 0xF); } printf("\n"); }
-#endif
-#ifdef SSFN_PROFILING
-        gettimeofday(&tv1, NULL); tvd.tv_sec = tv1.tv_sec - tv0.tv_sec; tvd.tv_usec = tv1.tv_usec - tv0.tv_usec;
-        if(tvd.tv_usec < 0) { tvd.tv_sec--; tvd.tv_usec += 1000000L; }
-        ctx->raster += tvd.tv_sec * 1000000L + tvd.tv_usec;
-        memcpy(&tv0, &tv1, sizeof(struct timeval));
-#endif
-    }
-    if(dst) {
-        /* blit glyph from cache into buffer */
-        h = H;
-        if(h > ctx->line) ctx->line = h;
-        w = ctx->g->p * h / ctx->g->h;
-        s = ((ctx->g->x - ctx->g->o) * h + ctx->f->height - 1) / ctx->f->height;
-        n = ctx->size > 16 ? 2 : 1;
-        if(w < n) w = n;
-        if(s < n) s = n;
-        if(ctx->g->x) {
-            ctx->ox = ox = ((ctx->g->o * h + ctx->f->height - 1) / ctx->f->height) + (ctx->style & SSFN_STYLE_RTL ? w : 0);
-            ctx->oy = oy = (ctx->g->a * h + ctx->f->height - 1) / ctx->f->height;
-        } else { ctx->ox = ox = w / 2; ctx->oy = oy = 0; }
-        if(dst->ptr) {
-            j = dst->w < 0 ? -dst->w : dst->w;
-            cs = dst->w < 0 ? 16 : 0;
-            cb = (h + 64) >> 6; uix = w > s ? w : s; uax = 0;
-            n = (ctx->f->underline * h + ctx->f->height - 1) / ctx->f->height;
-#ifdef SSFN_DEBUGGLYPH
-            printf("Scaling to w %d h %d (glyph %d %d, cache %d %d, font %d)\n",
-                w,h,ctx->rc->w,ctx->rc->h,ctx->g->p,ctx->g->h,ctx->f->height);
-#endif
-            fR = (dst->fg >> 16) & 0xFF; fG = (dst->fg >> 8) & 0xFF; fB = (dst->fg >> 0) & 0xFF; fA = (dst->fg >> 24) & 0xFF;
-            bR = (dst->bg >> 16) & 0xFF; bG = (dst->bg >> 8) & 0xFF; bB = (dst->bg >> 0) & 0xFF; O = 0xFF000000;
-            Op = (uint32_t*)(dst->ptr + dst->p * (dst->y - oy) + ((dst->x - ox) << 2));
-            for (y = 0; y < h && dst->y + y - oy < dst->h; y++, Op += dst->p >> 2) {
-                if(dst->y + y - oy < 0) continue;
-                y0 = (y << 8) * ctx->g->h / h; Y0 = y0 >> 8; y1 = ((y + 1) << 8) * ctx->g->h / h; Y1 = y1 >> 8; Ol = Op;
-                for (x = 0; x < w && dst->x + x - ox < j; x++, Ol++) {
-                    if(dst->x + x - ox < 0) continue;
-                    m = 0; sR = sG = sB = sA = bA = 0;
-                    if(!dst->bg) {
-                        /* real linear frame buffers should be accessed only as uint32_t on 32 bit boundary */
-                        O = *Ol;
-                        bA = (O >> 24) & 0xFF;
-                        bR = (O >> (16 - cs)) & 0xFF;
-                        bG = (O >> 8) & 0xFF;
-                        bB = (O >> cs) & 0xFF;
-                    }
-                    x0 = (x << 8) * ctx->g->p / w; X0 = x0 >> 8; x1 = ((x + 1) << 8) * ctx->g->p / w; X1 = x1 >> 8;
-                    for(ys = y0; ys < y1; ys += 256) {
-                        if(ys >> 8 == Y0) { yp = 256 - (ys & 0xFF); ys &= ~0xFF; if(yp > y1 - y0) yp = y1 - y0; }
-                        else if(ys >> 8 == Y1) yp = y1 & 0xFF; else yp = 256;
-                        X2 = (ys >> 8) * ctx->g->p;
-                        for(xs = x0; xs < x1; xs += 256) {
-                            if (xs >> 8 == X0) {
-                                k = 256 - (xs & 0xFF); xs &= ~0xFF; if(k > x1 - x0) k = x1 - x0; pc = k == 256 ? yp : (k * yp)>>8;
-                            } else
-                            if (xs >> 8 == X1) { k = x1 & 0xFF; pc = k == 256 ? yp : (k * yp) >> 8; }
-                            else pc = yp;
-                            m += pc;
-                            k = ctx->g->data[X2 + (xs >> 8)];
-                            if(k == 0xFF) {
-                                sB += bB * pc; sG += bG * pc; sR += bR * pc; sA += 255;
-                            } else {
-                                if(k == 0xFE || !ctx->f->cmap_offs) {
-                                    dB = fB; dG = fG; dR = fR; dA = fA;
-                                } else {
-                                    P = *((uint32_t*)((uint8_t*)ctx->f + ctx->f->cmap_offs + (k << 2)));
-                                    dR = (P >> 16) & 0xFF; dG = (P >> 8) & 0xFF; dB = (P >> 0) & 0xFF; dA = (P >> 24) & 0xFF;
-                                }
-                                if(dA == 255) {
-                                    sB += dB * pc; sG += dG * pc; sR += dR * pc; sA += dA * pc;
-                                } else {
-                                    sB += (dB * dA + bB * (255 - dA)) * pc / 255; sG += (dG * dA + bG * (255 - dA)) * pc / 255;
-                                    sR += (dR * dA + bR * (255 - dA)) * pc / 255; sA += dA * pc;
-                                }
-                            }
-                        }
-                    }
-                    if(m) { sR /= m; sG /= m; sB /= m; sA /= m; } else { sR >>= 8; sG >>= 8; sB >>= 8; sA >>= 8; }
-                    if(ctx->style & SSFN_STYLE_NOAA) sA = sA > 127 ? 255 : 0;
-                    if(sA > 15) {
-                        *Ol = ((sA > 255 ? 255 : (sA > bA ? sA : bA)) << 24) |
-                            ((sR > 255 ? 255 : sR) << (16 - cs)) | ((sG > 255 ? 255 : sG) << 8) | ((sB > 255 ? 255 : sB) << cs);
-                        if(y == n) { if(uix > x) { uix = x; } if(uax < x) { uax = x; } }
-                    }
-                }
-            }
-            if(ctx->style & SSFN_STYLE_UNDERLINE) {
-                uix -= cb + 1; uax += cb + 2;
-                if(uax < uix) uax = uix + 1;
-                k = (w > s ? w : s);
-                Op = (uint32_t*)(dst->ptr + dst->p * (dst->y - oy + n) + ((dst->x - ox - 1) << 2));
-                for (y = n; y < n + cb && dst->y + y - oy < dst->h; y++, Op += dst->p >> 2) {
-                    if(dst->y + y - oy < 0) continue;
-                    for (Ol = Op, x = 0; x <= k && dst->x + x - ox < j; x++, Ol++) {
-                        if(dst->x + x - ox < 0 || (x > uix && x < uax)) continue;
-                        PUTPIXEL;
-                    }
-                }
-            }
-            if(ctx->style & SSFN_STYLE_STHROUGH) {
-                n = (h >> 1); k = (w > s ? w : s) + 1;
-                Op = (uint32_t*)(dst->ptr + dst->p * (dst->y - oy + n) + ((dst->x - ox - 1) << 2));
-                for (y = n; y < n + cb && dst->y + y - oy < dst->h; y++, Op += dst->p >> 2) {
-                    if(dst->y + y - oy < 0) continue;
-                    for (Ol = Op, x = 0; x <= k && dst->x + x - ox < j; x++, Ol++) {
-                        if(dst->x + x - ox < 0) continue;
-                        PUTPIXEL;
-                    }
-                }
-            }
-#ifdef SSFN_PROFILING
-            gettimeofday(&tv1, NULL); tvd.tv_sec = tv1.tv_sec - tv0.tv_sec;tvd.tv_usec = tv1.tv_usec - tv0.tv_usec;
-            if(tvd.tv_usec < 0) { tvd.tv_sec--; tvd.tv_usec += 1000000L; }
-            ctx->blit += tvd.tv_sec * 1000000L + tvd.tv_usec;
-            memcpy(&tv0, &tv1, sizeof(struct timeval));
-#endif
-        }
-        /* add advance and kerning */
-        ctx->ax = (ctx->style & SSFN_STYLE_RTL ? -s : s);
-        dst->x += ctx->ax;
-        dst->y += (ctx->g->y * h + ctx->f->height - 1) / ctx->f->height;
-        ptr = (uint8_t*)str + ret;
-        if(!(ctx->style & SSFN_STYLE_NOKERN) && ctx->f->kerning_offs && _ssfn_c(ctx->f, (const char*)ptr, &i, &P) && P > 32) {
-            ptr = (uint8_t*)ctx->rc + sizeof(ssfn_chr_t);
-            /* check all kerning fragments, because we might have both vertical and horizontal kerning offsets */
-            for(n = 0; n < ctx->rc->n; n++) {
-                if(ptr[0] == 255 && ptr[1] == 255) { ptr += ctx->rc->t & 0x40 ? 6 : 5; continue; }
-                x = ptr[0];
-                if(ctx->rc->t & 0x40) { m = (ptr[5] << 24) | (ptr[4] << 16) | (ptr[3] << 8) | ptr[2]; ptr += 6; }
-                else { m = (ptr[4] << 16) | (ptr[3] << 8) | ptr[2]; ptr += 5; }
-                frg = (uint8_t*)ctx->f +  m;
-                if((frg[0] & 0xE0) == 0xC0) {
-                    k = (((frg[0] & 0x1F) << 8) | frg[1]) + 1; frg += 2;
-                    while(k--) {
-                        m = ((frg[2] & 0xF) << 16) | (frg[1] << 8) | frg[0];
-                        if(P >= (uint32_t)m && P <= (uint32_t)(((frg[5] & 0xF) << 16) | (frg[4] << 8) | frg[3])) {
-                            P -= m;
-                            m = ctx->f->kerning_offs + ((((frg[2] >> 4) & 0xF) << 24) | (((frg[5] >> 4) & 0xF) << 16) |
-                                (frg[7] << 8) | frg[6]);
-                            tmp = (uint8_t*)ctx->f + m;
-                            while(tmp < (uint8_t*)ctx->f + ctx->f->size - 4) {
-                                if((tmp[0] & 0x7F) < P) {
-                                    P -= (tmp[0] & 0x7F) + 1;
-                                    tmp += 2 + (tmp[0] & 0x80 ? 0 : tmp[0] & 0x7F);
-                                } else {
-                                    y = (int)((signed char)tmp[1 + ((tmp[0] & 0x80) ? 0 : P)]) * h / ctx->f->height;
-                                    if(x) dst->x += y; else dst->y += y;
-                                    break;
-                                }
-                            }
-                            break;
-                        }
-                        frg += 8;
-                    }
-                }
-            }
-#ifdef SSFN_PROFILING
-            gettimeofday(&tv1, NULL); tvd.tv_sec = tv1.tv_sec - tv0.tv_sec; tvd.tv_usec = tv1.tv_usec - tv0.tv_usec;
-            if(tvd.tv_usec < 0) { tvd.tv_sec--; tvd.tv_usec += 1000000L; }
-            ctx->kern += tvd.tv_sec * 1000000L + tvd.tv_usec;
-#endif
-        }
-    }
-    return ret;
-}
-
-/**
- * Get the bounding box for a string
-
- * @param ctx rendering context
- * @param str string to measure
- * @param w returned width
- * @param h returned height
- * @param left returned left margin
- * @param top returned ascender
- * @return error code
- */
-int ssfn_bbox(ssfn_t *ctx, const char *str, int *w, int *h, int *left, int *top)
-{
-    ssfn_buf_t buf;
-    int ret, f = 1, l = 0, t = 0;
-
-    if(!ctx || !str) return SSFN_ERR_INVINP;
-    if(w) {*w = 0;} if(h) {*h = 0;} if(top) {*top = 0;} if(left) {*left = 0;}
-    if(!*str) return SSFN_OK;
-    SSFN_memset(&buf, 0, sizeof(ssfn_buf_t)); ctx->line = 0;
-    while((ret = ssfn_render(ctx, &buf, str))) {
-        if(ret < 0 || !ctx->g) return ret;
-        if(f) { f = 0; l = ctx->ox; buf.x += l; }
-        if(ctx->g->x) {
-            if(ctx->oy > t) t = ctx->oy;
-        } else {
-            if(buf.w < ctx->g->p) buf.w = ctx->g->p;
-            buf.h += ctx->g->y ? ctx->g->y : ctx->g->h;
-        }
-        str += ret;
-    }
-    if((ctx->style & SSFN_STYLE_ITALIC) && !(SSFN_TYPE_STYLE(ctx->f->type) & SSFN_STYLE_ITALIC))
-        buf.x +=  ctx->size / SSFN_ITALIC_DIV - l;
-    if(ctx->g->x) { if(w) {*w = buf.x;} if(h) {*h = ctx->line;} if(left) {*left = l;} if(top) {*top = t;} }
-    else { if(w) {*w = buf.w;} if(h) {*h = buf.y;} if(top) {*top = 0;} if(left) {*left = 0;} }
-    return SSFN_OK;
-}
-
-/**
- * Render text to a newly allocated pixel buffer
- *
- * @param ctx rendering context
- * @param str string to measure
- * @return a newly allocated pixel buffer or NULL
- */
-ssfn_buf_t *ssfn_text(ssfn_t *ctx, const char *str, unsigned int fg)
-{
-#ifndef SSFN_MAXLINES
-    ssfn_buf_t *buf;
-    int ret;
-
-    if(!ctx || !str) return NULL;
-    buf = (ssfn_buf_t*)SSFN_realloc(NULL, sizeof(ssfn_buf_t));
-    if(!buf) return NULL;
-    SSFN_memset(buf, 0, sizeof(ssfn_buf_t));
-    buf->fg = fg;
-    if(!*str || ssfn_bbox(ctx, str, (int*)&buf->w, (int*)&buf->h, (int*)&buf->x, (int*)&buf->y) != SSFN_OK)
-        return buf;
-    buf->p = buf->w * sizeof(uint32_t);
-    buf->ptr = (uint8_t*)SSFN_realloc(NULL, buf->p * buf->h);
-    SSFN_memset(buf->ptr, 0, buf->p * buf->h);
-    while((ret = ssfn_render(ctx, buf, str)) > 0)
-        str += ret;
-    if(ret != SSFN_OK) { SSFN_free(buf->ptr); SSFN_free(buf); return NULL; }
-    return buf;
-#else
-    (void)ctx;
-    (void)str;
-    (void)fg;
-    return NULL;
-#endif
-}
-
-#endif /* SSFN_IMPLEMENTATION */
-
-#if defined(SSFN_CONSOLEBITMAP_PALETTE) || defined(SSFN_CONSOLEBITMAP_HICOLOR) || defined(SSFN_CONSOLEBITMAP_TRUECOLOR)
-/*** special console bitmap font renderer (ca. 1.5k, no dependencies, no memory allocation and no error checking) ***/
-
-/**
- * public variables to configure
- */
-ssfn_font_t *ssfn_src;          /* font buffer with an inflated bitmap font */
-ssfn_buf_t ssfn_dst;            /* destination frame buffer */
-
-/**
- * Minimal OS kernel console renderer
- *
- * @param unicode character
- * @return error code
- */
-int ssfn_putc(uint32_t unicode)
-{
-# ifdef SSFN_CONSOLEBITMAP_PALETTE
-#  define SSFN_PIXEL  uint8_t
-# else
-#  ifdef SSFN_CONSOLEBITMAP_HICOLOR
-#   define SSFN_PIXEL uint16_t
-#  else
-#   define SSFN_PIXEL uint32_t
-#  endif
-# endif
-    register SSFN_PIXEL *o, *p;
-    register uint8_t *ptr, *chr = NULL, *frg;
-    register int i, j, k, l, m, y = 0, w, s = ssfn_dst.p / sizeof(SSFN_PIXEL);
-
-    if(!ssfn_src || ssfn_src->magic[0] != 'S' || ssfn_src->magic[1] != 'F' || ssfn_src->magic[2] != 'N' ||
-        ssfn_src->magic[3] != '2' || !ssfn_dst.ptr || !ssfn_dst.p) return SSFN_ERR_INVINP;
-    w = ssfn_dst.w < 0 ? -ssfn_dst.w : ssfn_dst.w;
-    for(ptr = (uint8_t*)ssfn_src + ssfn_src->characters_offs, i = 0; i < 0x110000; i++) {
-        if(ptr[0] == 0xFF) { i += 65535; ptr++; }
-        else if((ptr[0] & 0xC0) == 0xC0) { j = (((ptr[0] & 0x3F) << 8) | ptr[1]); i += j; ptr += 2; }
-        else if((ptr[0] & 0xC0) == 0x80) { j = (ptr[0] & 0x3F); i += j; ptr++; }
-        else { if((uint32_t)i == unicode) { chr = ptr; break; } ptr += 6 + ptr[1] * (ptr[0] & 0x40 ? 6 : 5); }
-    }
-#ifdef SSFN_CONSOLEBITMAP_CONTROL
-    i = ssfn_src->height; j = ssfn_dst.h - i - (ssfn_dst.h % i);
-    if(chr && w) {
-        if(unicode == '\t') ssfn_dst.x -= ssfn_dst.x % chr[4];
-        if(ssfn_dst.x + chr[4] > w) { ssfn_dst.x = 0; ssfn_dst.y += i; }
-    }
-    if(unicode == '\n') ssfn_dst.y += i;
-    if(j > 0 && ssfn_dst.y > j) {
-        ssfn_dst.y = j;
-        for(k = 0; k < j; k++)
-            for(l = 0; l < ssfn_dst.p; l++) ssfn_dst.ptr[k * ssfn_dst.p + l] = ssfn_dst.ptr[(k + i) * ssfn_dst.p + l];
-    }
-    if(unicode == '\r' || unicode == '\n') { ssfn_dst.x = 0; return SSFN_OK; }
-#endif
-    if(!chr) return SSFN_ERR_NOGLYPH;
-    ptr = chr + 6; o = (SSFN_PIXEL*)(ssfn_dst.ptr + ssfn_dst.y * ssfn_dst.p + ssfn_dst.x * sizeof(SSFN_PIXEL));
-    for(i = 0; i < chr[1]; i++, ptr += chr[0] & 0x40 ? 6 : 5) {
-        if(ptr[0] == 255 && ptr[1] == 255) continue;
-        frg = (uint8_t*)ssfn_src + (chr[0] & 0x40 ? ((ptr[5] << 24) | (ptr[4] << 16) | (ptr[3] << 8) | ptr[2]) :
-            ((ptr[4] << 16) | (ptr[3] << 8) | ptr[2]));
-        if((frg[0] & 0xE0) != 0x80) continue;
-        if(ssfn_dst.bg) {
-            for(; y < ptr[1] && (!ssfn_dst.h || ssfn_dst.y + y < ssfn_dst.h); y++, o += s) {
-                for(p = o, j = 0; j < chr[2] && (!w || ssfn_dst.x + j < w); j++, p++) *p = ssfn_dst.bg;
-            }
-        } else { o += (int)(ptr[1] - y) * s; y = ptr[1]; }
-        k = ((frg[0] & 0x1F) + 1) << 3; j = frg[1] + 1; frg += 2;
-        for(m = 1; j && (!ssfn_dst.h || ssfn_dst.y + y < ssfn_dst.h); j--, y++, o += s)
-            for(p = o, l = 0; l < k; l++, p++, m <<= 1) {
-                if(m > 0x80) { frg++; m = 1; }
-                if(ssfn_dst.x + l >= 0 && (!w || ssfn_dst.x + l < w)) {
-                    if(*frg & m) *p = ssfn_dst.fg; else
-                    if(ssfn_dst.bg) *p = ssfn_dst.bg;
-                }
-            }
-    }
-    if(ssfn_dst.bg)
-        for(; y < chr[3] && (!ssfn_dst.h || ssfn_dst.y + y < ssfn_dst.h); y++, o += s) {
-            for(p = o, j = 0; j < chr[2] && (!w || ssfn_dst.x + j < w); j++, p++) *p = ssfn_dst.bg;
-        }
-    ssfn_dst.x += chr[4]; ssfn_dst.y += chr[5];
-    return SSFN_OK;
-}
-
-#endif /* SSFN_CONSOLEBITMAP */
-
-#ifdef  __cplusplus
-}
-/*** SSFN C++ Wrapper Class ***/
-#include <string>
-
-namespace SSFN {
-#ifndef SSFN_IMPLEMENTATION
-    class Font {
-        public:
-            Font();
-            ~Font();
-
-        public:
-            int Load(const std::string &data);
-            int Load(const void *data, int len);
-            int Select(int family, const std::string &name, int style, int size);
-            int Select(int family, const char *name, int style, int size);
-            int Render(ssfn_buf_t *dst, const std::string &str);
-            int Render(ssfn_buf_t *dst, const char *str);
-            int BBox(const std::string &str, int *w, int *h, int *left, int *top);
-            int BBox(const char *str, int *w, int *h, int *left, int *top);
-            ssfn_buf_t *Text(const std::string &str, unsigned int fg);
-            ssfn_buf_t *Text(const char *str, unsigned int fg);
-            int LineHeight();
-            int Mem();
-            const std::string ErrorStr(int err);
-    };
-#else
-    class Font {
-        private:
-            ssfn_t ctx;
-
-        public:
-            Font() { SSFN_memset(&this->ctx, 0, sizeof(ssfn_t)); }
-            ~Font() { ssfn_free(&this->ctx); }
-
-        public:
-            int Load(const std::string &data) { return ssfn_load(&this->ctx,reinterpret_cast<const void*>(data.data())); }
-            int Load(const void *data) { return ssfn_load(&this->ctx, data); }
-            int Select(int family, const std::string &name, int style, int size)
-                { return ssfn_select(&this->ctx, family, (char*)name.data(), style, size); }
-            int Select(int family, char *name, int style, int size) { return ssfn_select(&this->ctx,family,name,style,size); }
-            int Render(ssfn_buf_t *dst, const std::string &str) { return ssfn_render(&this->ctx,dst,(const char *)str.data()); }
-            int Render(ssfn_buf_t *dst, const char *str) { return ssfn_render(&this->ctx, dst, str); }
-            int BBox(const std::string &str, int *w, int *h, int *left, int *top)
-                { return ssfn_bbox(&this->ctx, (const char *)str.data(), w, h, left, top); }
-            int BBox(const char *str, int *w, int *h, int *left, int *top) { return ssfn_bbox(&this->ctx,str,w,h,left,top); }
-            ssfn_buf_t *Text(const std::string &str, unsigned int fg)
-                { return ssfn_text(&this->ctx,(const char*)str.data(), fg); }
-            ssfn_buf_t *Text(const char *str, unsigned int fg) { return ssfn_text(&this->ctx, str, fg); }
-            int LineHeight() { return this->ctx.line ? this->ctx.line : this->ctx.size; }
-            int Mem() { return ssfn_mem(&this->ctx); }
-            const std::string ErrorStr(int err) { return std::string(ssfn_error(err)); }
-    };
-#endif
-}
-#endif
-/*               */
-#endif /* _SSFN_H_ */
diff --git a/boot/include/ui/terminal.h b/boot/include/ui/terminal.h
deleted file mode 100644
index 07a5cdf..0000000
--- a/boot/include/ui/terminal.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  terminal.h                                                      */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#ifndef _UI_TERMINAL_H
-#define _UI_TERMINAL_H
-
-#include <stdint.h>
-
-struct terminal {
-	uint32_t cx;
-	uint32_t cy;
-
-	int font_size;
-};
-
-struct ui_context;
-
-void terminal_print(struct ui_context *ctx, char *fmt, ...);
-void terminal_setcur(struct ui_context *ui, uint32_t x, uint32_t y);
-
-#endif /* _UI_TERMINAL_H */
diff --git a/boot/include/ui/ui.h b/boot/include/ui/ui.h
deleted file mode 100644
index becffdd..0000000
--- a/boot/include/ui/ui.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  ui.h                                                            */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#ifndef _UI_UI_H
-#define _UI_UI_H
-
-#include <ui/framebuffer.h>
-#include <ui/terminal.h>
-#include <ui/font.h>
-
-// this is so hacky... but it works
-#ifdef FONT_IMPLEMENTATION
-#include <lib/string.h>
-#include <mm/mman.h>
-
-#define SSFN_memcmp memcmp
-#define SSFN_memset memset
-#define SSFN_realloc mem_realloc
-#define SSFN_free mem_free
-#define SSFN_IMPLEMENTATION
-#endif
-#include <ui/ssfn.h>
-
-#include <stdint.h>
-
-struct mouse_event {
-	uint16_t x;
-	uint16_t y;
-	uint8_t but;
-};
-
-struct ui_context {
-	uint32_t *fb_addr;
-	struct fb_mode *fb_modes;
-	int total_modes;
-	int current_mode;
-	int ui;
-
-	struct mouse_event last_mouse;
-
-	int current_selection;
-	int last_selection;
-
-	struct terminal terminal;
-
-	ssfn_t font;
-	ssfn_buf_t font_buf;
-	char *font_file;
-};
-
-void ui_init();
-
-#endif /* _UI_UI_H */
\ No newline at end of file
diff --git a/boot/platform/uefi/Makefile b/boot/platform/uefi/Makefile
index d15e3c7..4abcba3 100644
--- a/boot/platform/uefi/Makefile
+++ b/boot/platform/uefi/Makefile
@@ -37,8 +37,7 @@ INCLUDE_DIRS += $(BOOT_ROOT)/include \
 				$(BOOT_ROOT)/include/arch/$(ARCH) \
 				$(BOOT_ROOT)/include/arch/$(ARCH)/uefi \
 				$(BOOT_ROOT)/include/platform/$(PLATFORM) \
-				$(BOOT_ROOT)/platform/uefi/libefi \
-				$(BOOT_ROOT)/platform/uefi/drivers/intel-hda
+				$(BOOT_ROOT)/platform/uefi/libefi
 
 UEFI_AS := $(ARCH)-w64-mingw32-as
 UEFI_CC := clang
@@ -52,10 +51,7 @@ UEFI_CFLAGS := $(CFLAGS) \
 				-DAXBOOT_UEFI=1 \
 				$(foreach d, $(INCLUDE_DIRS), -I$d) \
 				-target $(ARCH)-unknown-windows \
-				-std=c11 \
-				-flto \
 				-fshort-wchar \
-				-msoft-float \
 				-mno-red-zone \
 				-mno-stack-arg-probe
 
@@ -71,7 +67,6 @@ UEFI_LDFLAGS := $(LDFLAGS) \
 				-fuse-ld=lld-link \
 				-Wl,-subsystem:efi_application \
 				-Wl,-entry:uefi_entry
-
 COMMON_CFILES := $(shell find $(BOOT_ROOT)/common -name '*.c')
 COMMON_ARCH_CFILES := $(shell find $(BOOT_ROOT)/arch/$(ARCH)/common -name '*.c')
 COMMON_ARCH_ASFILES := $(shell find $(BOOT_ROOT)/arch/$(ARCH)/common -name '*.S')
diff --git a/boot/platform/uefi/acpi.c b/boot/platform/uefi/acpi.c
deleted file mode 100644
index 7a0cf1a..0000000
--- a/boot/platform/uefi/acpi.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  acpi.c                                                          */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#include <lib/string.h>
-#include <print.h>
-#include <stdint.h>
-
-#include <efi.h>
-#include <efilib.h>
-
-uintptr_t platform_get_rsdp()
-{
-	EFI_GUID acpi10_guid = EFI_ACPI_10_TABLE_GUID;
-	EFI_GUID acpi20_guid = EFI_ACPI_20_TABLE_GUID;
-	uintptr_t rsdp_addr = 0;
-
-	for (EFI_UINTN i = 0; i < gSystemTable->NumberOfTableEntries; i++) {
-		if (memcmp(&(gSystemTable->ConfigurationTable[i].VendorGuid), &acpi10_guid, sizeof(EFI_GUID)) == 0) {
-			log("platform_get_rsdp(): Found RSDP (ACPI 1.0) at 0x%llx\n", gSystemTable->ConfigurationTable[i].VendorTable);
-			rsdp_addr = (uintptr_t)gSystemTable->ConfigurationTable[i].VendorTable;
-		}
-
-		// ACPI 2.0+ always takes higher priority over older version
-		if (memcmp(&(gSystemTable->ConfigurationTable[i].VendorGuid), &acpi20_guid, sizeof(EFI_GUID)) == 0) {
-			log("platform_get_rsdp(): Found RSDP (ACPI 2.0+) at 0x%llx\n", gSystemTable->ConfigurationTable[i].VendorTable);
-			return (uintptr_t)gSystemTable->ConfigurationTable[i].VendorTable;
-		}
-	}
-
-	if (rsdp_addr == 0) {
-		log("platform_get_rsdp(): RSDP not found!\n");
-	}
-
-	return rsdp_addr;
-}
-
-uintptr_t platform_get_smbios()
-{
-	EFI_GUID smbios_guid = SMBIOS_TABLE_GUID;
-	EFI_GUID smbios3_guid = SMBIOS3_TABLE_GUID;
-	uintptr_t smbios_addr = 0;
-
-	for (EFI_UINTN i = 0; i < gSystemTable->NumberOfTableEntries; i++) {
-		if (memcmp(&(gSystemTable->ConfigurationTable[i].VendorGuid), &smbios_guid, sizeof(EFI_GUID)) == 0) {
-			log("platform_get_rsmbios(): Found SMBIOS at 0x%llx\n", gSystemTable->ConfigurationTable[i].VendorTable);
-			smbios_addr = (uintptr_t)gSystemTable->ConfigurationTable[i].VendorTable;
-		}
-
-		// SMBIOS3 always takes higher priority over older version
-		if (memcmp(&(gSystemTable->ConfigurationTable[i].VendorGuid), &smbios3_guid, sizeof(EFI_GUID)) == 0) {
-			log("platform_get_smbios(): Found SMBIOS3 at 0x%llx\n", gSystemTable->ConfigurationTable[i].VendorTable);
-			return (uintptr_t)gSystemTable->ConfigurationTable[i].VendorTable;
-		}
-	}
-
-	if (smbios_addr == 0) {
-		log("platform_get_smbios(): SMBIOS not found!\n");
-	}
-
-	return smbios_addr;
-}
\ No newline at end of file
diff --git a/boot/platform/uefi/driver.c b/boot/platform/uefi/driver.c
deleted file mode 100644
index 6890350..0000000
--- a/boot/platform/uefi/driver.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  entry.c                                                         */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#include <driver.h>
-#include <config/config.h>
-#include <mm/mman.h>
-#include <lib/string.h>
-#include <vfs/vfs.h>
-#include <print.h>
-
-#include <efi.h>
-#include <efilib.h>
-#include <stdbool.h>
-
-bool verify_secure_boot()
-{
-	EFI_GUID var_guid = EFI_GLOBAL_VARIABLE;
-	EFI_UINT8 val = 0;
-	EFI_UINTN size = sizeof(val);
-	bool ret = 0;
-
-	if (!EFI_ERROR(gSystemTable->RuntimeServices->GetVariable(L"SecureBoot", &var_guid, NULL, &size, &val))) {
-		log("verify_secure_boot(): Secure Boot Status: %u\n", val);
-		ret = (bool)val;
-
-		if (!EFI_ERROR(gSystemTable->RuntimeServices->GetVariable(L"SetupMode", &var_guid, NULL, &size, &val)) && val != 0) {
-			ret = false;
-		}
-	}
-
-	return !ret;
-}
-
-void load_drivers()
-{
-	// EFI_STATUS status;
-	if (!verify_secure_boot()) {
-		log("load_drivers(): Secure boot is enabled! Won't load drivers...\n");
-		return;
-	}
-
-	// TODO: Create a vfs_list() function to get a list of files in a directory
-	// char *driver_path = "\\AxBoot\\drivers\\.efi";
-	// char *driver_binary;
-	// log("load_drivers(): Loading '%s'...\n", driver_name);
-	//
-	// size_t driver_size = vfs_read(driver_path, &driver_binary);
-	//
-	// driver_devpath[0].Header.Length[0] = sizeof(EFI_MEMMAP_DEVICE_PATH);
-    // driver_devpath[0].Header.Length[1] = sizeof(EFI_MEMMAP_DEVICE_PATH) >> 8;
-    // driver_devpath[0].Header.Type = 1;
-    // driver_devpath[0].Header.SubType = 3;
-    // driver_devpath[0].MemoryType = EfiLoaderData;
-    // driver_devpath[0].StartingAddress = (EFI_UINTPTR)driver_binary;
-    // driver_devpath[0].EndingAddress = (EFI_UINTPTR)driver_binary + driver_size;
-    // driver_devpath[1].Header.Length[0] = sizeof(EFI_DEVICE_PATH_PROTOCOL);
-    // driver_devpath[1].Header.Length[1] = sizeof(EFI_DEVICE_PATH_PROTOCOL) >> 8;
-    // driver_devpath[1].Header.Type = 0x7F;
-    // driver_devpath[1].Header.SubType = 0xFF;
-	//
-	// status = gSystemTable->BootServices->LoadImage(EFI_FALSE, gImageHandle, (EFI_DEVICE_PATH_PROTOCOL *)driver_devpath, driver_binary, driver_size, &driver_handle);
-	// if (EFI_ERROR(status)) {
-		// log("load_drivers(): Failed to load driver '%s': %s (%llx)\n", driver_name, efi_status_to_str(status), status);
-		// return;
-	// }
-	// 
-	// status = gSystemTable->BootServices->StartImage(driver_handle, NULL, NULL);
-	// if (EFI_ERROR(status)) {
-		// log("load_drivers(): Failed to start driver '%s': %s (%llx)\n", driver_name, efi_status_to_str(status), status);
-		// return;
-	// }
-}
\ No newline at end of file
diff --git a/boot/platform/uefi/entry.c b/boot/platform/uefi/entry.c
index 6fe9c6a..78c495f 100644
--- a/boot/platform/uefi/entry.c
+++ b/boot/platform/uefi/entry.c
@@ -23,120 +23,32 @@
 #include <axboot.h>
 #include <mm/mman.h>
 #include <lib/string.h>
-#include <power.h>
 #include <print.h>
 
-#include <stdint.h>
 #include <stddef.h>
 
 EFI_HANDLE gImageHandle;
 EFI_SYSTEM_TABLE *gSystemTable;
 EFI_BOOT_SERVICES *gBootServices;
 
-EFI_SIMPLE_POINTER_PROTOCOL *gPointerProtocol;
-uint16_t mouse_resx;
-uint16_t mouse_resy;
-
 EFI_STATUS uefi_entry(EFI_HANDLE ImageHandle,
-					   EFI_SYSTEM_TABLE *SystemTable)
+                       EFI_SYSTEM_TABLE *SystemTable)
 {
-	EFI_STATUS Status;
-	EFI_GUID spp_guid = EFI_SIMPLE_POINTER_PROTOCOL_GUID;
-	EFI_SIMPLE_POINTER_PROTOCOL *spp[5];
+    EFI_STATUS Status;
 
-	gImageHandle = ImageHandle;
-	gSystemTable = SystemTable;
-	gBootServices = SystemTable->BootServices;
+    gImageHandle = ImageHandle;
+    gSystemTable = SystemTable;
+    gBootServices = SystemTable->BootServices;
 
-	// reset input
-	gSystemTable->ConIn->Reset(gSystemTable->ConIn, EFI_FALSE);
+    // clear the screen
+    gSystemTable->ConOut->ClearScreen(gSystemTable->ConOut);
 
-	// clear the screen
-	gSystemTable->ConOut->ClearScreen(gSystemTable->ConOut);
+    // disable UEFI watchdog
+    Status = gSystemTable->BootServices->SetWatchdogTimer(0, 0, 0, NULL);
+    if (EFI_ERROR(Status)) {
+        debug("Couldn't disable UEFI watchdog: %s (%x)\n", efi_status_to_str(Status), Status);
+    }
 
-	// disable UEFI watchdog
-	Status = gSystemTable->BootServices->SetWatchdogTimer(0, 0, 0, NULL);
-	if (EFI_ERROR(Status)) {
-		debug("uefi_entry(): Couldn't disable UEFI watchdog: %s (%x)\n", efi_status_to_str(Status), Status);
-	}
-
-	// load that mouse up
-	EFI_UINTN spp_handles = 0;
-	EFI_HANDLE *spp_handle_buf = NULL;
-	Status = gBootServices->LocateHandleBuffer(ByProtocol, &spp_guid, NULL, &spp_handles, &spp_handle_buf);
-	if (EFI_ERROR(Status)) {
-		debug("uefi_entry(): Failed to locate Simple Pointer Protocol handle buffer: %s (%x).", efi_status_to_str(Status), Status);
-	} else {
-		debug("uefi_entry(): Found %u handle%s\n", spp_handles, spp_handles == 1 ? "" : "s");
-		for (EFI_UINTN i = 0; i < spp_handles; i++) {
-			Status = gBootServices->OpenProtocol(spp_handle_buf[i], &spp_guid, (void **)&spp[i], gImageHandle, NULL, EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL);
-			if (EFI_ERROR(Status)) {
-				debug("uefi_entry(): Failed to open Simple Pointer Protocol on handle: %s (%x)\n", efi_status_to_str(Status), Status);
-				continue;
-			}
-
-			debug("uefi_entry(): Found SPP with ResX=%u, ResY=%u\n", spp[i]->Mode->ResolutionX, spp[i]->Mode->ResolutionY);
-			if (spp[i]->Reset(spp[i], EFI_TRUE) == EFI_DEVICE_ERROR) {
-				debug("uefi_entry(): Failed to reset device\n");
-				continue;
-			}
-
-			if (spp[i]->Mode->ResolutionX < 65536) {
-				gPointerProtocol = spp[i];
-				mouse_resx = spp[i]->Mode->ResolutionX;
-				mouse_resy = spp[i]->Mode->ResolutionY;
-				break;
-			}
-		}
-	}
-
-	axboot_init();
-	UNREACHABLE();
-}
-
-#define EXIT_BS_MAX_TRIES 10
-
-void uefi_exit_bs(void)
-{
-	EFI_UINTN map_key = 0;
-	EFI_UINTN map_size = 0;
-	EFI_MEMORY_DESCRIPTOR *map = NULL;
-	EFI_UINTN desc_size = 0;
-	EFI_UINT32 desc_ver = 0;
-	EFI_STATUS status;
-	
-	int tries = 0;
-
-	log("uefi_exit_bs(): Calling ExitBootServices(), this will be the last log you'll see before handoff!\n");
-
-	do {
-		map_key = 0;
-		map_size = 0;
-		desc_size = 0;
-		desc_ver = 0;
-		map = NULL;
-
-		tries++;
-		debug("uefi_exit_bs(): Trying to exit Boot Services, try %u/%u...\n", tries, EXIT_BS_MAX_TRIES);
-
-		status = gBootServices->GetMemoryMap(&map_size, map, &map_key, &desc_size, &desc_ver);
-		if (EFI_ERROR(status) && status != EFI_BUFFER_TOO_SMALL) {
-			log("uefi_exit_bs(): Failed to acquire memory map key: %s (%llx)\n", efi_status_to_str(status), status);
-			continue;
-		}
-
-		status = gBootServices->ExitBootServices(gImageHandle, map_key);
-		if (EFI_ERROR(status)) {
-			log("uefi_exit_bs(): Failed to exit boot services: %s (%llx)\n", efi_status_to_str(status), status);
-			continue;
-		}
-
-		break;
-	} while (tries <= EXIT_BS_MAX_TRIES);
-
-	if (EFI_ERROR(status)) {
-		log("uefi_exit_bs(): Failed to exit Boot Services, rebooting!");
-		platform_reboot();
-		UNREACHABLE();
-	}
-}
+    axboot_init();
+    UNREACHABLE();
+}
\ No newline at end of file
diff --git a/boot/platform/uefi/libefi b/boot/platform/uefi/libefi
index 37d4b54..c6a93ef 160000
--- a/boot/platform/uefi/libefi
+++ b/boot/platform/uefi/libefi
@@ -1 +1 @@
-Subproject commit 37d4b5459f6473324b4a30b067cc013dcab7821f
+Subproject commit c6a93ef5d4f6129cc579b3376d1f2990515210f9
diff --git a/boot/platform/uefi/mm/memmap.c b/boot/platform/uefi/mm/memmap.c
index d411af2..d0dee4e 100644
--- a/boot/platform/uefi/mm/memmap.c
+++ b/boot/platform/uefi/mm/memmap.c
@@ -30,58 +30,54 @@
 static int efi_type_to_axboot(uint32_t efi_type)
 {
 	switch (efi_type) {
+		case EfiReservedMemoryType:
+			return MemMapReserved;
+		case EfiLoaderCode:
+			return MemMapFirmware;
 		case EfiLoaderData:
+			return MemMapFirmware;
 		case EfiBootServicesCode:
 		case EfiBootServicesData:
 			return MemMapFreeOnLoad;
-
 		case EfiRuntimeServicesCode:
 		case EfiRuntimeServicesData:
-		case EfiLoaderCode:
 			return MemMapFirmware;
-		
-		case EfiUnusableMemory:
-			return MemMapFaulty;
-
-		case EfiACPIReclaimMemory:
-			return MemMapACPIReclaimable;
-
-		case EfiACPIMemoryNVS:
-			return MemMapACPINVS;
-
-		case EfiMemoryMappedIO:
-			return MemMapACPIMappedIO;
-
-		case EfiMemoryMappedIOPortSpace:
-			return MemMapACPIMappedIOPortSpace;
-
-		case EfiPalCode:
-		case EfiPersistentMemory:
 		case EfiConventionalMemory:
 			return MemMapUsable;
+		case EfiUnusableMemory:
+			return MemMapFaulty;
+		case EfiACPIReclaimMemory:
+			return MemMapACPIReclaimable;
+		case EfiACPIMemoryNVS:
+			return MemMapACPINVS;
+		case EfiMemoryMappedIO:
+			return MemMapACPIMappedIO;
+		case EfiMemoryMappedIOPortSpace:
+			return MemMapACPIMappedIOPortSpace;
+		case EfiPalCode:
+			return MemMapUsable;
+		case EfiPersistentMemory:
 			return MemMapUsable;
-
 		case EfiUnacceptedMemoryType:
-		case EfiReservedMemoryType:
 			return MemMapReserved;
 		default:
 			return MemMapReserved;
 	}
 }
 
-uint32_t get_memmap(axboot_memmap **map, pagetable *pm)
+axboot_memmap *get_memmap(pagetable *pm)
 {
-	EFI_MEMORY_DESCRIPTOR *efi_map = NULL;
-	EFI_UINTN efi_map_key = 0;
+	EFI_MEMORY_DESCRIPTOR *efi_map;
+	EFI_UINTN efi_map_key;
 	EFI_UINTN size = 0;
-	EFI_UINTN desc_size = 0;
-	EFI_UINT32 desc_ver = 0;
-	EFI_STATUS status = 0;
+	EFI_UINTN desc_size;
+	EFI_UINT32 desc_ver;
+	EFI_STATUS status;
 
 	status = gBootServices->GetMemoryMap(&size, efi_map, &efi_map_key, &desc_size, &desc_ver);
 	if (EFI_ERROR(status) && status != EFI_BUFFER_TOO_SMALL) {
-		log("get_memmap(): GetMemoryMap() returned an error: %s (0x%llx)\n", efi_status_to_str(status), status);
-		return 0;
+		debug("get_memmap(): GetMemoryMap() returned an error: %s (0x%llx)\n", efi_status_to_str(status), status);
+		return NULL;
 	}
 
 	efi_map = (EFI_MEMORY_DESCRIPTOR *)mem_alloc(size);
@@ -94,8 +90,8 @@ uint32_t get_memmap(axboot_memmap **map, pagetable *pm)
 			size += 2 * desc_size;
 			efi_map = (EFI_MEMORY_DESCRIPTOR *)mem_realloc(efi_map, size);
 		} else {
-			log("get_memmap(): GetMemoryMap() returned an error: %s (0x%llx)\n", efi_status_to_str(status), status);
-			return 0;
+			debug("get_memmap(): GetMemoryMap() returned an error: %s (0x%llx)\n", efi_status_to_str(status), status);
+			return NULL;
 		}
 	} while (status != EFI_SUCCESS);
 
@@ -103,7 +99,7 @@ uint32_t get_memmap(axboot_memmap **map, pagetable *pm)
 	uint32_t entry_count = size / desc_size;
 
 	// map all the memory
-	for (uint32_t i = 0; i < entry_count; i++) {
+	for (int i = 0; i < entry_count; i++) {
 		uint64_t flags;
 		switch (cur_entry->Type) {
 			case EfiConventionalMemory:
@@ -137,19 +133,21 @@ uint32_t get_memmap(axboot_memmap **map, pagetable *pm)
 		cur_entry = (EFI_MEMORY_DESCRIPTOR *)((uint8_t *)cur_entry + desc_size);
 	}
 
-	*map = mem_alloc(sizeof(axboot_memmap) * entry_count);
-	memset(*map, 0, sizeof(axboot_memmap) * entry_count);
+	axboot_memmap *new_map = (axboot_memmap *)mem_alloc(sizeof(axboot_memmap) * entry_count);
+	memset(new_map, 0, sizeof(axboot_memmap) * entry_count);
+	
+	cur_entry = efi_map;
 	
 	// translate efi memmap to axboot memmap
-	for (uint32_t i = 0; i < entry_count; i++) {
-		(*map)[i].base = cur_entry->PhysicalStart;
-		(*map)[i].size = cur_entry->NumberOfPages * PAGE_SIZE;
-		(*map)[i].type = efi_type_to_axboot(efi_map[i].Type);
+	for (int i = 0; i < entry_count; i++) {
+		new_map[i].base = cur_entry->PhysicalStart;
+		new_map[i].size = cur_entry->NumberOfPages * PAGE_SIZE;
+		new_map[i].type = efi_type_to_axboot(efi_map[i].Type);
 
 		cur_entry = (EFI_MEMORY_DESCRIPTOR *)((uint8_t *)cur_entry + desc_size);
 	}
 
 	mem_free(efi_map);
 
-	return entry_count;
+	return new_map;
 }
diff --git a/boot/platform/uefi/power.c b/boot/platform/uefi/power.c
deleted file mode 100644
index d5afd3f..0000000
--- a/boot/platform/uefi/power.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  power.c                                                         */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#include <power.h>
-#include <efi.h>
-#include <efilib.h>
-#include <axboot.h>
-#include <print.h>
-
-#include <stdbool.h>
-
-bool platform_is_reboot_to_fw_possible()
-{
-	EFI_STATUS Status;
-	EFI_UINT64 OsIndications;
-	EFI_UINTN OsIndicationsSize = sizeof(EFI_UINT64);
-	EFI_GUID GlobalVarGuid = EFI_GLOBAL_VARIABLE;
-
-	Status = gSystemTable->RuntimeServices->GetVariable(L"OsIndicationsSupported", &GlobalVarGuid, NULL, &OsIndicationsSize, &OsIndications);
-	if (!EFI_ERROR(Status)) {
-		if (OsIndications & EFI_OS_INDICATIONS_BOOT_TO_FW_UI) {
-			log("platform_is_reboot_to_fw_possible(): Boot to firmware UI is possible!\n");
-			return true;
-		}
-	} else {
-		log("platform_is_reboot_to_fw_possible(): Failed to get OsIndications variable: 0x%llx (%s) \n", Status, efi_status_to_str(Status));
-	}
-
-	return false;
-}
-
-void platform_reboot_to_fw()
-{
-	if (!platform_is_reboot_to_fw_possible()) {
-		return;
-	}
-
-	EFI_STATUS Status;
-	EFI_UINT64 OsIndications = EFI_OS_INDICATIONS_BOOT_TO_FW_UI;
-	EFI_UINTN OsIndicationsSize = sizeof(EFI_UINT64);
-	EFI_GUID GlobalVarGuid = EFI_GLOBAL_VARIABLE;
-
-	Status = gSystemTable->RuntimeServices->SetVariable(L"OsIndications", &GlobalVarGuid, EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS, OsIndicationsSize, &OsIndications);
-	if (EFI_ERROR(Status)) {
-		log("platform_reboot_to_fw(): Failed to set OsIndications variable: 0x%llx (%s) \n", Status, efi_status_to_str(Status));
-	}
-
-	gSystemTable->RuntimeServices->ResetSystem(EfiResetCold, EFI_SUCCESS, 0, NULL);
-}
-
-void platform_reboot()
-{
-	gSystemTable->RuntimeServices->ResetSystem(EfiResetWarm, EFI_SUCCESS, 0, NULL);
-}
-
-void platform_shutdown()
-{
-	gSystemTable->RuntimeServices->ResetSystem(EfiResetShutdown, EFI_SUCCESS, 0, NULL);
-}
\ No newline at end of file
diff --git a/boot/include/driver.h b/boot/platform/uefi/print.c
similarity index 83%
rename from boot/include/driver.h
rename to boot/platform/uefi/print.c
index 617bf2b..2f4817c 100644
--- a/boot/include/driver.h
+++ b/boot/platform/uefi/print.c
@@ -1,5 +1,5 @@
 /*********************************************************************************/
-/* Module Name:  driver.h                                                        */
+/* Module Name:  print.c                                                         */
 /* Project:      AurixOS                                                         */
 /*                                                                               */
 /* Copyright (c) 2024-2025 Jozef Nagy                                            */
@@ -17,23 +17,14 @@
 /* SOFTWARE.                                                                     */
 /*********************************************************************************/
 
-#ifndef _DRIVER_H
-#define _DRIVER_H
-
-#ifdef AXBOOT_UEFI
-
-#include <stddef.h>
+#include <lib/string.h>
 #include <efi.h>
+#include <efilib.h>
 
-struct driver {
-	EFI_HANDLE handle;
-	char *binary;
-	size_t binsize;
-	EFI_MEMMAP_DEVICE_PATH devpath[2];
-};
-
-void load_drivers();
-
-#endif
-
-#endif /* _DRIVER_H */
\ No newline at end of file
+void printstr(const char *str)
+{
+	CHAR16 wstr[4096];
+	mbstowcs(wstr, &str, strlen(str));
+	wstr[strlen(str)] = '\0';
+	gSystemTable->ConOut->OutputString(gSystemTable->ConOut, wstr);
+}
\ No newline at end of file
diff --git a/boot/platform/uefi/time/datetime.c b/boot/platform/uefi/time/datetime.c
deleted file mode 100644
index dcc2e9b..0000000
--- a/boot/platform/uefi/time/datetime.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  datetime.c                                                      */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#include <time/dt.h>
-#include <stdint.h>
-#include <stddef.h>
-#include <axboot.h>
-#include <print.h>
-
-#include <efi.h>
-#include <efilib.h>
-
-void get_datetime(struct datetime *dt)
-{
-	EFI_STATUS status;
-	EFI_TIME uefi_dt;
-
-	status = gSystemTable->RuntimeServices->GetTime(&uefi_dt, NULL);
-	if (EFI_ERROR(status)) {
-		log("get_datetime(): Failed to acquire current time, setting to 1970/01/01 00:00:00!\n");
-		return;
-	}
-
-	dt->year = uefi_dt.Year;
-	dt->month = uefi_dt.Month;
-	dt->day = uefi_dt.Day;
-	dt->h = uefi_dt.Hour;
-	dt->m = uefi_dt.Minute;
-	dt->s = uefi_dt.Second;
-}
diff --git a/boot/platform/uefi/ui/framebuffer.c b/boot/platform/uefi/ui/framebuffer.c
deleted file mode 100644
index a800df7..0000000
--- a/boot/platform/uefi/ui/framebuffer.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  framebuffer.c                                                   */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#include <mm/mman.h>
-#include <ui/framebuffer.h>
-#include <print.h>
-#include <efi.h>
-#include <efilib.h>
-
-#include <stdint.h>
-#include <stddef.h>
-
-bool get_framebuffer(uint32_t **fb_addr, struct fb_mode **available_modes, int *total_modes, int *current_mode_index)
-{
-	EFI_GUID gop_guid = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID; 
-    EFI_GRAPHICS_OUTPUT_PROTOCOL *gop = NULL;
-    EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info = NULL;
-    EFI_UINTN mode_info_size = sizeof(EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);
-	EFI_UINTN SizeOfInfo;
-	EFI_UINTN numModes = 0;
-	EFI_UINTN nativeMode = 0;
-    EFI_UINTN mode_index = 0;
-	EFI_STATUS Status;
-
-	Status = gBootServices->LocateProtocol(&gop_guid, NULL, (void**)&gop);
-	if (EFI_ERROR(Status)) {
-    	log("get_framebuffer(): Unable to locate GOP: %s (0x%llx)\n", efi_status_to_str(Status), Status);
-	}
-
-	Status = gop->QueryMode(gop, gop->Mode == NULL ? 0 : gop->Mode->Mode, &SizeOfInfo, &mode_info);
-	// this is needed to get the current video mode
-	if (Status == EFI_NOT_STARTED) {
-		Status = gop->SetMode(gop, 0);
-	} else if (EFI_ERROR(Status)) {
-		log("Unable to get native mode\n");
-		return false;
-	} else {
-		nativeMode = gop->Mode->Mode;
-		numModes = gop->Mode->MaxMode;
-	}
-
-	if (total_modes != NULL) {
-		*total_modes = numModes;
-	}
-	*available_modes = (struct fb_mode *)mem_alloc(sizeof(struct fb_mode) * numModes);
-
-	*fb_addr = (uint32_t *)gop->Mode->FrameBufferBase;
-
-	// get all available modes
-	for (int i = 0; i < (int)numModes; i++) {
-		Status = gop->QueryMode(gop, i, &SizeOfInfo, &mode_info);
-
-		(*available_modes)[i].width = mode_info->HorizontalResolution;
-		(*available_modes)[i].height = mode_info->VerticalResolution;
-		(*available_modes)[i].bpp = 4;
-		(*available_modes)[i].pitch = mode_info->PixelsPerScanLine * 4;
-
-		if (mode_info->PixelFormat == PixelRedGreenBlueReserved8BitPerColor) {
-			(*available_modes)[i].format = FB_RGBA;
-		} else if (mode_info->PixelFormat == PixelBlueGreenRedReserved8BitPerColor) {
-			(*available_modes)[i].format = FB_BGRA;
-		} else {
-			log("get_framebuffer(): Unknown framebuffer format, assuming BGRA...\n");
-			(*available_modes)[i].format = FB_BGRA;
-		}
-		
-		if (i == (int)nativeMode) {
-			*current_mode_index = i;
-		}
-	  }
-
-    gop->QueryMode(gop, mode_index, &mode_info_size, &mode_info);
-
-	return true;
-}
\ No newline at end of file
diff --git a/boot/platform/uefi/ui/keyboard.c b/boot/platform/uefi/ui/keyboard.c
deleted file mode 100644
index 6c65254..0000000
--- a/boot/platform/uefi/ui/keyboard.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  keyboard.c                                                      */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#include <ui/keyboard.h>
-#include <stdint.h>
-#include <print.h>
-
-#include <efi.h>
-#include <efilib.h>
-
-void get_keypress(uint16_t *scancode)
-{
-	EFI_INPUT_KEY key;
-	if (gSystemTable->ConIn->ReadKeyStroke(gSystemTable->ConIn, &key) == EFI_SUCCESS) {
-		if (key.UnicodeChar == L'\r') {
-			*scancode = SCANCODE_ENTER;
-			return;
-		}
-		*scancode = key.ScanCode;
-	} else {
-		*scancode = 0;
-	}
-}
\ No newline at end of file
diff --git a/boot/platform/uefi/ui/mouse.c b/boot/platform/uefi/ui/mouse.c
deleted file mode 100644
index 4bd9aa4..0000000
--- a/boot/platform/uefi/ui/mouse.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  mouse.c                                                         */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#include <ui/ui.h>
-#include <ui/mouse.h>
-#include <efi.h>
-#include <efilib.h>
-#include <stdint.h>
-
-extern EFI_SIMPLE_POINTER_PROTOCOL *gPointerProtocol;
-extern uint16_t mouse_resx;
-extern uint16_t mouse_resy;
-
-void get_mouse(uint16_t *mouse_x, uint16_t *mouse_y, uint8_t *mouse_buttons)
-{
-	if (!gPointerProtocol) {
-		return;
-	}
-
-	*mouse_buttons = 0;
-	EFI_SIMPLE_POINTER_STATE state;
-	gPointerProtocol->GetState(gPointerProtocol, &state);
-
-	*mouse_buttons |= state.LeftButton ? LEFT_MOUSE_BUTTON : 0;
-	*mouse_buttons |= state.RightButton ? RIGHT_MOUSE_BUTTON : 0;
-
-	*mouse_x += state.RelativeMovementX / mouse_resx;
-	*mouse_y += state.RelativeMovementY / mouse_resy;
-}
\ No newline at end of file
diff --git a/boot/sound/chime.mp3 b/boot/sound/chime.mp3
deleted file mode 100644
index 1b21c4b..0000000
Binary files a/boot/sound/chime.mp3 and /dev/null differ
diff --git a/boot/sound/license.txt b/boot/sound/license.txt
deleted file mode 100644
index e19a502..0000000
--- a/boot/sound/license.txt
+++ /dev/null
@@ -1 +0,0 @@
-AxBoot Sounds © 2025 by Jozef Nagy is licensed under CC BY-SA 4.0. To view a copy of this license, visit https://creativecommons.org/licenses/by-sa/4.0/
\ No newline at end of file
diff --git a/boot/sound/note.txt b/boot/sound/note.txt
deleted file mode 100644
index 0cb21fe..0000000
--- a/boot/sound/note.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-1. Convert an audio file to .raw format:
-
-ffmpeg -i $file -acodec pcm_s16le -f s16le -ac 2 $file.raw
-
-2. Convert .raw to C header:
-
-python3 utils/gen_sound_header.py $file.raw
\ No newline at end of file
diff --git a/docs/boot/CONFIG.md b/docs/boot/CONFIG.md
new file mode 100644
index 0000000..281ddf3
--- /dev/null
+++ b/docs/boot/CONFIG.md
@@ -0,0 +1,51 @@
+# Soapine configuration
+To work and do what you told it to do, Soapine uses a configuration file.
+
+## Location
+Soapine will search for the configuration in:
+* `(boot partition)\soapine.cfg`
+* `(boot partition)\soapine\soapine.cfg`
+* `(boot partition)\EFI\BOOT\soapine.cfg`
+* `(boot partition)\EFI\soapine.cfg`
+
+If Soapine finds the config file, he parses it and jump to his usual menu. Else, Soapine will display a stop screen saying that you need to fix your configuration
+
+## Accepted value types
+* String literal (`"Hello, World!"`)
+* Decimal (`2`)
+* Hexadecimal (`0x2`)
+* Hexadecimal color (`#FFFFFF`)
+* Boolean (`true/false`)
+
+## Declarations
+Declarations are values that components of Soapine will search for:
+If you declare `VERBOSE` with a value of true, Soapine will itself put in verbose mode.
+
+You can do a declaration by writing the name + an equal sign + the value (using the accepted value types), that will make `NAME=VALUE`.
+
+If an unused declaration is provided (for example `FORCE_SOAPINE_TO_LIKE_ME=true`), Soapine will simply ignore it, but it will still be present.
+
+Here are some example declarations:
+* `MENU_BRANDING="Raphaël's Custom Soapine!!"` (string literal)
+* `MENU_HEADERBAR_BG=#FFFFFF` (Hexadecimal color)
+* `MENU_HEADERBAR_MARGIN=1` (decimal)
+* `VERBOSE=true` (boolean)
+* `LOAD_ADDRESS=0x1000` (hexadecimal)
+
+## Menu entries
+Menu entries allow you to show an operating system (that can be loaded with the supported protocols!) on the menu.
+They are declared like that:
+
+```c
+menu_entry "Project Jupiter" {
+
+};
+```
+*(yes i decided to give a C-like syntax to it)*
+
+You can put a small number of declarations inside the menu entries. (PROTOCOL, IMAGE_PATH, CMDLINE, RESOLUTION) (Providing the `PROTOCOL` and `IMAGE_PATH` declarations is required for Soapine to boot your OS!)
+
+## Supported declarations
+None for now (we just got the config parser working!)
+
+At least, you can still define entries!
\ No newline at end of file
diff --git a/docs/boot/PHILOSOPHY.md b/docs/boot/PHILOSOPHY.md
new file mode 100644
index 0000000..ab2f903
--- /dev/null
+++ b/docs/boot/PHILOSOPHY.md
@@ -0,0 +1,10 @@
+# Soapine's philosophy
+Soapine is meant to be lightweight, while being useful to everyone:
+
+* Ship the bootloader with multiple features (even the weirdest features)
+* Ability to extend the bootloader with ELF extensions: If you wanna write an extension to support PE loading, ***DO IT***.
+
+Soapine is also meant to be customizable:
+
+* You can modify each bit of the bootloader: If you wanna center the headerbar text, you ***CAN***
+* You can change the default values in Soapine's source code.
\ No newline at end of file
diff --git a/docs/boot/TRANSLATING.md b/docs/boot/TRANSLATING.md
deleted file mode 100644
index 3d74214..0000000
--- a/docs/boot/TRANSLATING.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Translating AxBoot
-
-To translate AxBoot, copy `en_US.c` in the `common/i18n` directory and rename it (and the translation structure) to the target language code.
-Before translating each string, open `common/i18n/i18n.c` and register the new language:
-
-```c
-extern struct language i18n_xxXX;
-
-struct language_selection i18n_languages[] = {
-	{
-		"English", // Localized language name (eg. English, Čeština, Svenska, ...)
-		"en_US", // Language code
-		&i18n_enUS // reference to the language structure
-	},
-	/* ... */
-}
-```
diff --git a/kernel/Makefile b/kernel/Makefile
index 4890579..a7027f1 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -47,12 +47,15 @@ KERNEL_CFLAGS := $(foreach d, $(INCLUDE_DIRS), -I$d) \
 				-fno-omit-frame-pointer \
 				-fno-stack-protector \
 				-fno-stack-check \
+				-fpic \
+				-fpie \
 				-MMD \
 				-MP
 
 KERNEL_LDFLAGS := -Tarch/$(ARCH)/linker.ld \
 				-nostdlib \
-				-static
+				-static \
+				-no-pie
 
 ifeq ($(BUILD_TYPE),debug)
 KERNEL_CFLAGS += -O0 -g3
diff --git a/kernel/arch/x86_64/config.mk b/kernel/arch/x86_64/config.mk
index 738c9ca..7be3279 100644
--- a/kernel/arch/x86_64/config.mk
+++ b/kernel/arch/x86_64/config.mk
@@ -20,7 +20,6 @@
 KERNEL_CFLAGS += -m64 \
 				-march=x86-64 \
 				-mabi=sysv \
-				-mcmodel=kernel \
 				-mno-red-zone \
 				-mno-80387 \
 				-mno-mmx \
diff --git a/kernel/arch/x86_64/linker.ld b/kernel/arch/x86_64/linker.ld
index 758e8b6..7314b13 100644
--- a/kernel/arch/x86_64/linker.ld
+++ b/kernel/arch/x86_64/linker.ld
@@ -31,7 +31,8 @@ PHDRS
 
 SECTIONS
 {
-	. = 0xffffffff80000000;
+	/* TODO: 0xffffffff80000000 */
+	. = 0x1000;
 
 	_linker_start_text = .;
 
diff --git a/kernel/include/boot/aurix.h b/kernel/include/boot/aurix.h
deleted file mode 100644
index e3b26f2..0000000
--- a/kernel/include/boot/aurix.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  aurix.h                                                         */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* 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 OR COPYRIGHT HOLDERS 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.                                                                     */
-/*********************************************************************************/
-
-#ifndef _AURIX_H
-#define _AURIX_H
-
-#include <stdint.h>
-
-#define AURIX_PROTOCOL_REVISION 1
-
-enum aurix_memmap_entry {
-	AURIX_MMAP_RESERVED = 0,
-	
-	AURIX_MMAP_ACPI_RECLAIMABLE = 1,
-	AURIX_MMAP_ACPI_MAPPED_IO = 2,
-	AURIX_MMAP_ACPI_MAPPED_IO_PORTSPACE = 3,
-	AURIX_MMAP_ACPI_NVS = 4,
-
-	AURIX_MMAP_BOOTLOADER_RECLAIMABLE = 6,
-	AURIX_MMAP_USABLE = 7
-};
-
-enum aurix_framebuffer_format {
-	AURIX_FB_RGBA = 0,
-	AURIX_FB_BGRA = 1
-};
-
-struct aurix_memmap {
-	uintptr_t base;
-	uint32_t size;
-	uint8_t type;
-};
-
-struct aurix_framebuffer {
-	uintptr_t addr;
-	uint32_t width;
-	uint32_t height;
-	uint8_t bpp; // bits!
-	uint32_t pitch;
-	int format;
-};
-
-struct aurix_parameters {
-	// PROTOCOL INFO
-	uint8_t revision;
-
-	// MEMORY
-	struct aurix_memmap *mmap;
-	uint32_t mmap_entries;
-
-	uintptr_t kernel_addr; // physical address
-
-	// RSDP and SMBIOS
-	uintptr_t rsdp_addr;
-	uintptr_t smbios_addr;
-
-	// FRAMEBUFFER
-	struct aurix_framebuffer *framebuffer;
-};
-
-#ifdef _AXBOOT
-#include <mm/vmm.h>
-void aurix_load(char *kernel);
-
-void aurix_arch_handoff(void *kernel_entry, pagetable *pm, void *stack, uint32_t stack_size, struct aurix_parameters *parameters);
-#endif
-
-#endif /* _PROTO_AURIX_H */
diff --git a/kernel/kinit.c b/kernel/kinit.c
index 0d12edd..4b35ba3 100644
--- a/kernel/kinit.c
+++ b/kernel/kinit.c
@@ -17,22 +17,11 @@
 /* SOFTWARE.                                                                     */
 /*********************************************************************************/
 
-#include <boot/aurix.h>
 #include <debug/uart.h>
 
-void _start(struct aurix_parameters *params)
+void _start(void)
 {
 	serial_init();
-
-	if (params->revision != AURIX_PROTOCOL_REVISION) {
-		serial_sendstr("Aurix Protocol revision is not compatible!\n");
-	}
-
-	for (int i = 0; i < 100; i++) {
-        volatile uint32_t *fb_ptr = (uint32_t *)params->framebuffer->addr;
-        fb_ptr[i * (params->framebuffer->pitch / 4) + i] = 0xffffff;
-    }
-
 	serial_sendstr("Hello from AurixOS!\n");
 
 	for (;;) {
diff --git a/utils/arch/x86_64/generate-hdd.sh b/utils/arch/x86_64/generate-hdd.sh
index 67a6dec..39673ee 100755
--- a/utils/arch/x86_64/generate-hdd.sh
+++ b/utils/arch/x86_64/generate-hdd.sh
@@ -75,7 +75,6 @@ if [ "$unamestr" = 'Linux' ]; then
 	exit 200
 elif [ "$unamestr" = 'Darwin' ]; then
 	diskutil unmount "$tempmountdir" >/dev/null 2>&1
-	diskutil unmountDisk "$loopback" >/dev/null 2>&1
 	hdiutil detach "$loopback" >/dev/null 2>&1
 fi
 
@@ -85,6 +84,4 @@ rm -r "$tempmountdir"
 dd if="$BUILD_DIR/boot/pc-bios/stage1-hdd.bin" of="$disk_name" conv=notrunc bs=446 count=1 >/dev/null 2>&1
 dd if="$BUILD_DIR/boot/pc-bios/stage1-hdd.bin" of="$disk_name" conv=notrunc bs=1 count=2 skip=510 seek=510 >/dev/null 2>&1
 
-sync
-
 printf " done.\n"
diff --git a/utils/arch/x86_64/generate-iso.sh b/utils/arch/x86_64/generate-iso.sh
index edef01e..27355d8 100755
--- a/utils/arch/x86_64/generate-iso.sh
+++ b/utils/arch/x86_64/generate-iso.sh
@@ -13,10 +13,12 @@ tempmountdir=$(mktemp -d 2>/dev/null)
 # Create UEFI image
 dd if=/dev/zero of=$uefi_image bs=1k count=1440 >/dev/null 2>&1
 mformat -i $uefi_image -f 1440 :: >/dev/null 2>&1
+mmd -i $uefi_image ::/EFI >/dev/null 2>&1
+mmd -i $uefi_image ::/EFI/BOOT >/dev/null 2>&1
+mcopy -i $uefi_image $SYSROOT_DIR/EFI/BOOT/BOOTX64.EFI ::/EFI/BOOT >/dev/null 2>&1
 ## !FIXME: Huge hack! Make a filesystem.
-mcopy -i $uefi_image -s $SYSROOT_DIR/EFI :: >/dev/null 2>&1
-mcopy -i $uefi_image -s $SYSROOT_DIR/System :: >/dev/null 2>&1
-mcopy -i $uefi_image -s $SYSROOT_DIR/AxBoot :: >/dev/null 2>&1
+mmd -i $uefi_image ::/System >/dev/null 2>&1
+mcopy -i $uefi_image $SYSROOT_DIR/System/axkrnl ::/System >/dev/null 2>&1
 
 # Create directory structure
 mkdir -p $tempmountdir/boot
diff --git a/utils/bin_to_header.py b/utils/bin_to_header.py
deleted file mode 100644
index 2cd0dd8..0000000
--- a/utils/bin_to_header.py
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env python3
-###################################################################################
-## Module Name:  gen_sound_header.py                                             ##
-## Project:      AurixOS                                                         ##
-##                                                                               ##
-## Copyright (c) 2024-2025 Jozef Nagy                                            ##
-##                                                                               ##
-## This source is subject to the MIT License.                                    ##
-## See License.txt in the root of this repository.                               ##
-## All other rights reserved.                                                    ##
-##                                                                               ##
-## 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 OR COPYRIGHT HOLDERS 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.                                                                     ##
-###################################################################################
-
-import os
-import sys
-from pathlib import Path
-
-input_file = sys.argv[1]
-output_file = sys.argv[2]
-var_name = Path(input_file).stem
-filesize = os.path.getsize(input_file)
-raw_input = ""
-
-with open(input_file, "rb") as f:
-	raw_input = f.read()
-	f.close()
-
-with open(output_file, "w") as f:
-	f.write("// THIS FILE IS AUTOMATICALLY GENERATED! DO NOT EDIT!\n\n")
-	f.write("const unsigned int {var}_len = {size};\n".format(var = var_name, size = filesize))
-	f.write("static const unsigned char *{var}_data = {{\n\t".format(var = var_name))
-	for i in range(0, filesize):
-		f.write("{bytes},".format(bytes = format(raw_input[i], '#04x')))
-		if (i % 16) == 15:
-			f.write("\n\t")
-		else:
-			f.write(" ")
-	f.write("};\n")
-	f.close()