diff --git a/apps/system/init/Makefile b/apps/system/init/Makefile
index 21c80b5..370d542 100644
--- a/apps/system/init/Makefile
+++ b/apps/system/init/Makefile
@@ -1,7 +1,9 @@
 # Config file
 include ../../../../Makefile.conf
 
-FILENAME = init.fex
+FILENAME = init.elf
+
+SYSROOT = --sysroot=../../../out/system/
 
 CC = ../../../../$(COMPILER_PATH)/$(COMPILER_ARCH)gcc
 CPP = ../../../../$(COMPILER_PATH)/$(COMPILER_ARCH)g++
@@ -25,16 +27,11 @@ S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not
 C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i686/*")
 CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i686/*")
 endif
-HEADERS = $(sort $(dir $(wildcard ./include/*)))
+HEADERS = $(sort $(dir $(wildcard ../../../out/system/include/*)))
 OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o)
-INCLUDE_DIR = ./include
+INCLUDE_DIR = ../../../out/system/include
 
-LDFLAGS := 									\
-	-fPIC -fno-pie 							\
-	-Wl,-static,--no-dynamic-linker,-ztext 	\
-	-nostdlib -nodefaultlibs -nolibc  		\
-	-zmax-page-size=0x1000					\
-	-Wl,-Map file.map -shared
+LDFLAGS := -fPIC -Wl,-Map file.map
 
 WARNCFLAG = -Wall -Wextra
 
@@ -45,38 +42,27 @@ CFLAGS :=										\
 
 ifeq ($(OSARCH), amd64)
 
-CFLAGS += -fPIC -fno-pie -mno-80387 -mno-mmx -mno-3dnow	\
-		  -mno-red-zone -mno-sse -mno-sse2				\
-		  -march=x86-64 -pipe -ffunction-sections		\
-		  -mcmodel=kernel -msoft-float -fno-builtin
+CFLAGS += -fPIC -march=x86-64
 LDFLAGS += -Tarch/amd64/linker.ld
 
 else ifeq ($(OSARCH), i686)
 
-CFLAGS += -fPIC -fno-pie -mno-80387 -mno-mmx -mno-3dnow	\
-		  -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections	\
-		  -march=i686 -pipe -msoft-float -fno-builtin
+CFLAGS += -fPIC -march=i686
 LDFLAGS += -Tarch/i686/linker.ld
 
 else ifeq ($(OSARCH), aarch64)
 
-CFLAGS += -pipe -fno-builtin -fPIC
+CFLAGS += -pipe -fPIC
 LDFLAGS += -Tarch/aarch64/linker.ld
 
 endif
 
 build: $(FILENAME)
-ifeq ($(OSARCH), amd64)
-	$(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map
-else ifeq ($(OSARCH), i686)
-
-else ifeq ($(OSARCH), aarch64)
-
-endif
+	$(OBJDUMP) -d $(FILENAME) > file_dump.map
 	mv $(FILENAME) ../../../out/system/$(FILENAME)
 
 $(FILENAME): $(OBJ)
-	$(CC) $(LDFLAGS) $(OBJ) -o $@
+	$(CC) $(LDFLAGS) $(SYSROOT) $(OBJ) -o $@
 
 %.o: %.c $(HEADERS)
 	$(info Compiling $<)
diff --git a/apps/system/init/arch/amd64/linker.ld b/apps/system/init/arch/amd64/linker.ld
index f818bfc..57f30f4 100644
--- a/apps/system/init/arch/amd64/linker.ld
+++ b/apps/system/init/arch/amd64/linker.ld
@@ -1,15 +1,10 @@
-OUTPUT_FORMAT(binary)
+OUTPUT_FORMAT(elf64-x86-64)
 OUTPUT_ARCH(i386:x86-64)
 
 ENTRY(_start)
 
 SECTIONS
 {
-    .header :
-    {
-        *(.header .header.*)
-    }
-
     .text :
     {
         *(.text .text.*)
diff --git a/apps/system/init/init.cpp b/apps/system/init/init.cpp
index 96312a7..beb12c3 100644
--- a/apps/system/init/init.cpp
+++ b/apps/system/init/init.cpp
@@ -1,29 +1,17 @@
-#include "../../../../Kernel/Fex.hpp"
-
-extern "C" int _start(void *Data);
-
-HEAD(FexFormatType_Executable, FexOSType_Fennix, _start);
-
-#define DEFINE_SYSCALL0(function, n)          \
-    static inline long syscall_##function()   \
-    {                                         \
-        long a = n;                           \
-        __asm__ __volatile__("pushq %%r11\n"  \
-                             "pushq %%rcx\n"  \
-                             "syscall\n"      \
-                             "popq %%rcx\n"   \
-                             "popq %%r11\n"   \
-                             : "=a"(a)        \
-                             : "a"((long)a)); \
-        return a;                             \
-    }
-
-DEFINE_SYSCALL0(exit, 1);
 #define UNUSED(x) (void)(x)
 
-extern "C" int _start(void *Data)
+extern "C" int main(int argc, char *argv[], char *envp[])
 {
-    UNUSED(Data);
-    syscall_exit();
+    UNUSED(argc);
+    UNUSED(argv);
+    UNUSED(envp);
+
+    // unsigned long ret;
+    // asm volatile("syscall"
+    //              : "=a"(ret)
+    //              : "a"(1), "D"(1)
+    //              : "rcx", "r11", "memory");
+
+    // syscall_exit();
     return 0;
 }