diff --git a/boards/x230/x230.config b/boards/x230/x230.config
index 3b4f2cfd..1d46ba92 100644
--- a/boards/x230/x230.config
+++ b/boards/x230/x230.config
@@ -17,17 +17,23 @@ CONFIG_QRENCODE=y
 CONFIG_TPMTOTP=y
 CONFIG_DROPBEAR=y
 
+CONFIG_CAIRO=y
+CONFIG_FBWHIPTAIL=y
+
 CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000E=y
 
 export CONFIG_TPM=y
-export CONFIG_BOOTSCRIPT=/bin/generic-init
+export CONFIG_BOOTSCRIPT=/bin/gui-init
 export CONFIG_BOOT_REQ_HASH=n
 export CONFIG_BOOT_REQ_ROLLBACK=n
-export CONFIG_BOOT_KERNEL_ADD="intel_iommu=on"
+export CONFIG_BOOT_KERNEL_ADD="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOOT_KERNEL_REMOVE="quiet"
 export CONFIG_BOOT_DEV="/dev/sda1"
+export CONFIG_BOOT_GUI_MENU_NAME="Thinkpad X230 Heads Boot Menu"
 export CONFIG_USB_BOOT_DEV="/dev/sdb1"
+export CONFIG_WARNING_BG_COLOR="--background-gradient 0 0 0 150 125 0"
+export CONFIG_ERROR_BG_COLOR="--background-gradient 0 0 0 150 0 0"
 
 # This board has two SPI flash chips, an 8 MB that holds the IFD,
 # the ME image and part of the coreboot image, and a 4 MB one that
diff --git a/config/coreboot-x230.config b/config/coreboot-x230.config
index 61e9dd9d..65b13b58 100644
--- a/config/coreboot-x230.config
+++ b/config/coreboot-x230.config
@@ -11,11 +11,14 @@ CONFIG_DRIVERS_UART_8250IO=y
 CONFIG_BOARD_LENOVO_X230=y
 CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_UART_PCI_ADDR=0
+CONFIG_NO_GFX_INIT=y
 # CONFIG_CONSOLE_SERIAL is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y
 CONFIG_PAYLOAD_LINUX=y
 CONFIG_PAYLOAD_FILE="../../build/x230/bzImage"
-CONFIG_LINUX_COMMAND_LINE="quiet"
+CONFIG_PAYLOAD_OPTIONS=""
+# CONFIG_PXE is not set
+CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet"
 CONFIG_LINUX_INITRD="../../build/x230/initrd.cpio.xz"
 CONFIG_DEBUG_SMM_RELOCATION=y
diff --git a/config/linux-x230.config b/config/linux-x230.config
index ff9d94ad..25855270 100644
--- a/config/linux-x230.config
+++ b/config/linux-x230.config
@@ -182,6 +182,7 @@ CONFIG_PTP_1588_CLOCK=y
 # CONFIG_X86_PKG_TEMP_THERMAL is not set
 CONFIG_MFD_SYSCON=y
 CONFIG_DRM=y
+CONFIG_DRM_I915=y
 CONFIG_FB_VESA=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_LCD_CLASS_DEVICE is not set