FILESYSTEMS :=
DRIVERS :=
-MODULES := Storage/ATA Storage/FDD
-MODULES += Network/NE2000
-MODULES += Display/VESA
-MODULES += Display/BochsGA
+MODULES :=
MODULES += Filesystems/Ext2
MODULES += Filesystems/FAT
MODULES += Filesystems/NTFS
-MODULES += IPStack
-DYNMODS := USB/Core
+
+ifeq ($(ARCHDIR),x86)
+MODULES += Storage/ATA Storage/FDD
+MODULES += Network/NE2000 Network/RTL8139
+MODULES += Display/VESA
+MODULES += Display/BochsGA
+MODULES += Interfaces/UDI
+MODULES += Input/PS2KbMouse
+MODULES += x86/ISADMA x86/VGAText
+endif
+
+ifeq ($(ARCHDIR),x86_64)
+MODULES += Storage/ATA Storage/FDD
+MODULES += Network/NE2000 Network/RTL8139
+MODULES += Display/BochsGA
MODULES += Interfaces/UDI
MODULES += Input/PS2KbMouse
-MODULES += x86/ISADMA
+MODULES += x86/ISADMA x86/VGAText
+endif
+
+MODULES += IPStack # So the other modules are loaded before it
+DYNMODS := USB/Core