diff --git a/stand/defaults/loader.conf b/stand/defaults/loader.conf
index b1e87520a2d4..5d66708d30ef 100644
--- a/stand/defaults/loader.conf
+++ b/stand/defaults/loader.conf
@@ -1,195 +1,196 @@
 # This is loader.conf - a file full of useful variables that you can
 # set to change the default load behavior of your system. You should
 # not edit this file!  Put any overrides into one of the
 # loader_conf_files instead and you will be able to update these
 # defaults later without spamming your local configuration information.
 #
 # All arguments must be in double quotes.
 #
 
 ###  Basic configuration options  ############################
 exec="echo Loading /boot/defaults/loader.conf"
 
 kernel="kernel"		# /boot sub-directory containing kernel and modules
 bootfile="kernel"	# Kernel name (possibly absolute path)
 kernel_options=""	# Flags to be passed to the kernel
 loader_conf_files="/boot/device.hints /boot/loader.conf"
 loader_conf_dirs="/boot/loader.conf.d"
 local_loader_conf_files="/boot/loader.conf.local"
 nextboot_conf="/boot/nextboot.conf"
 verbose_loading="NO"		# Set to YES for verbose loader output
 
 ###  Splash screen configuration  ############################
 splash_bmp_load="NO"		# Set this to YES for bmp splash screen!
 splash_pcx_load="NO"		# Set this to YES for pcx splash screen!
 splash_txt_load="NO"		# Set this to YES for TheDraw splash screen!
 vesa_load="NO"			# Set this to YES to load the vesa module
 bitmap_load="NO"		# Set this to YES if you want splash screen!
 bitmap_name="splash.bmp"	# Set this to the name of the file
 bitmap_type="splash_image_data" # and place it on the module_path
 splash="/boot/images/freebsd-logo-rev.png"  # Set boot_mute=YES to load it
 
 ###  Screen saver modules  ###################################
 # This is best done in rc.conf
 screensave_load="NO"		# Set to YES to load a screensaver module
 screensave_name="green_saver"	# Set to the name of the screensaver module
 
 ###  Early hostid configuration ############################
 hostuuid_load="YES"
 hostuuid_name="/etc/hostid"
 hostuuid_type="hostuuid"
 
 ###  Random number generator configuration  ##################
 # See rc.conf(5). The entropy_boot_file config variable must agree with the
 # settings below.
 entropy_cache_load="YES"		# Set this to NO to disable loading
 					# cached entropy at boot time
 entropy_cache_name="/boot/entropy"	# Set this to the name of the file
 entropy_cache_type="boot_entropy_cache"	# Required for the kernel to find
 					# the boot-time entropy cache. This
 					# must not change value even if the
 					# _name above does change!
 entropy_efi_seed="YES"			# Set this to NO to disable loading
 					# entropy from the UEFI hardware
 					# random number generator API
 entropy_efi_seed_size="2048"		# Set this to a different value to
 					# change the amount of entropy
 					# requested from EFI
 
 ###  RAM Blacklist configuration  ############################
 ram_blacklist_load="NO"			# Set this to YES to load a file
 					# containing a list of addresses to
 					# exclude from the running system.
 ram_blacklist_name="/boot/blacklist.txt" # Set this to the name of the file
 ram_blacklist_type="ram_blacklist"	# Required for the kernel to find
 					# the blacklist module
 
 ###  Microcode loading configuration  ########################
 cpu_microcode_load="NO"			# Set this to YES to load and apply a
 					# microcode update file during boot.
 cpu_microcode_name="/boot/firmware/ucode.bin" # Set this to the microcode
 					      # update file path.
 cpu_microcode_type="cpu_microcode"	# Required for the kernel to find
 					# the microcode update file.
 
 ###  ACPI settings  ##########################################
 acpi_dsdt_load="NO"		# DSDT Overriding
 acpi_dsdt_type="acpi_dsdt"	# Don't change this
 acpi_dsdt_name="/boot/acpi_dsdt.aml"
 				# Override DSDT in BIOS by this file
 acpi_video_load="NO"		# Load the ACPI video extension driver
 
 ###  Audit settings  #########################################
 audit_event_load="NO"		# Preload audit_event config
 audit_event_name="/etc/security/audit_event"
 audit_event_type="etc_security_audit_event"
 
 ###  Initial memory disk settings  ###########################
 #mdroot_load="YES"		# The "mdroot" prefix is arbitrary.
 #mdroot_type="md_image"		# Create md(4) disk at boot.
 #mdroot_name="/boot/root.img"	# Path to a file containing the image.
 #rootdev="ufs:/dev/md0"		# Set the root filesystem to md(4) device.
 
 ###  Loader settings  ########################################
 #loader_delay="3"		# Delay in seconds before loading anything.
 				# Default is unset and disabled (no delay).
 #autoboot_delay="10"		# Delay in seconds before autobooting,
 				# -1 for no user interrupts, NO to disable
 #password=""			# Prevent changes to boot options
 #bootlock_password=""		# Prevent booting (see check-password.4th(8))
 #geom_eli_passphrase_prompt="NO" # Prompt for geli(8) passphrase to mount root
 bootenv_autolist="YES"		# Auto populate the list of ZFS Boot Environments
 #beastie_disable="NO"		# Turn the beastie boot menu on and off
 efi_max_resolution="1x1"	# Set the max resolution for EFI loader to use:
 				# 480p, 720p, 1080p, 1440p, 2160p/4k, 5k, or
 				# WidthxHeight (e.g. 1920x1080)
 #kernels="kernel kernel.old"	# Kernels to display in the boot menu
 kernels_autodetect="YES"	# Auto-detect kernel directories in /boot
+#loader_gfx="YES"		# Use graphical images when available
 #loader_logo="orbbw"		# Desired logo: orbbw, orb, fbsdbw, beastiebw, beastie, none
 #comconsole_speed="115200"	# Set the current serial console speed
 #console="vidconsole"		# A comma separated list of console(s)
 #currdev="disk1s1a"		# Set the current device
 module_path="/boot/modules;/boot/firmware;/boot/dtb;/boot/dtb/overlays"	# Set the module search path
 module_blacklist="drm drm2 radeonkms i915kms amdgpu"	# Loader module blacklist
 #prompt="\\${interpret}"	# Set the command prompt
 #root_disk_unit="0"		# Force the root disk unit number
 #rootdev="disk1s1a"		# Set the root filesystem
 #dumpdev="disk1s1b"		# Set a dump device early in the boot process
 #tftp.blksize="1428"		# Set the RFC 2348 TFTP block size.
 				# If the TFTP server does not support RFC 2348,
 				# the block size is set to 512. Valid: (8,9007)
 #twiddle_divisor="16"		# >16 slows down the progress indicator;
 				# <16 speeds up the progress indicator.
 
 ###  Kernel settings  ########################################
 # The following boot_ variables are enabled by setting them to any value.
 # Their presence in the kernel environment (see kenv(1)) has the same
 # effect as setting the given boot flag (see boot(8)).
 #boot_askname=""	# -a: Prompt the user for the name of the root device
 #boot_cdrom=""		# -C: Attempt to mount root file system from CD-ROM
 #boot_ddb=""		# -d: Instructs the kernel to start in the DDB debugger
 #boot_dfltroot=""	# -r: Use the statically configured root file system
 #boot_gdb=""		# -g: Selects gdb-remote mode for the kernel debugger
 #boot_multicons=""	# -D: Use multiple consoles
 #boot_mute=""		# -m: Mute the console
 #boot_pause=""		# -p: Pause after each line during device probing
 #boot_serial=""		# -h: Use serial console
 #boot_single=""		# -s: Start system in single-user mode
 #boot_verbose=""	# -v: Causes extra debugging information to be printed
 #init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init"
 			# Sets the list of init candidates
 #init_shell="/bin/sh"	# The shell binary used by init(8).
 #init_script=""		# Initial script to run by init(8) before chrooting.
 #init_chroot=""		# Directory for init(8) to chroot into.
 
 ###  Kernel tunables  ########################################
 #hw.physmem="1G"		# Limit physical memory. See loader(8)
 #kern.dfldsiz=""		# Set the initial data size limit
 #kern.dflssiz=""		# Set the initial stack size limit
 #kern.hz="100"			# Set the kernel interval timer rate
 #kern.maxbcache=""		# Set the max buffer cache KVA storage
 #kern.maxdsiz=""		# Set the max data size
 #kern.maxfiles=""		# Set the sys. wide open files limit
 #kern.maxproc=""		# Set the maximum # of processes
 #kern.maxssiz=""		# Set the max stack size
 #kern.maxswzone=""		# Set the max swmeta KVA storage
 #kern.maxtsiz=""		# Set the max text size
 #kern.maxusers="32"		# Set size of various static tables
 #kern.msgbufsize="65536"	# Set size of kernel message buffer
 #kern.nbuf=""			# Set the number of buffer headers
 #kern.ncallout=""		# Set the maximum # of timer events
 #kern.ngroups="1023"		# Set the maximum # of supplemental groups
 #kern.sgrowsiz=""		# Set the amount to grow stack
 #kern.cam.boot_delay="10000"	# Delay (in ms) of root mount for CAM bus
 				# registration, useful for USB sticks as root
 #kern.cam.scsi_delay="2000"	# Delay (in ms) before probing SCSI
 #kern.ipc.maxsockets=""		# Set the maximum number of sockets available
 #kern.ipc.nmbclusters=""	# Set the number of mbuf clusters
 #kern.ipc.nsfbufs=""		# Set the number of sendfile(2) bufs
 #net.inet.tcp.tcbhashsize=""	# Set the value of TCBHASHSIZE
 #vfs.root.mountfrom=""		# Specify root partition
 #vm.kmem_size=""		# Sets the size of kernel memory (bytes)
 #debug.kdb.break_to_debugger="0" # Allow console to break into debugger.
 #debug.ktr.cpumask="0xf"	# Bitmask of CPUs to enable KTR on
 #debug.ktr.mask="0x1200"	# Bitmask of KTR events to enable
 #debug.ktr.verbose="1"		# Enable console dump of KTR events
 
 ###  Module loading syntax example  ##########################
 #module_load="YES"		# loads module "module"
 #module_name="realname"		# uses "realname" instead of "module"
 #module_type="type"		# passes "-t type" to load
 #module_flags="flags"		# passes "flags" to the module
 #module_before="cmd"		# executes "cmd" before loading the module
 #module_after="cmd"		# executes "cmd" after loading the module
 #module_error="cmd"		# executes "cmd" if load fails
 
 ### Firmware names mapping list
 iwm3160fw_type="firmware"
 iwm7260fw_type="firmware"
 iwm7265fw_type="firmware"
 iwm8265fw_type="firmware"
 iwm9260fw_type="firmware"
 iwm3168fw_type="firmware"
 iwm7265Dfw_type="firmware"
 iwm8000C_type="firmware"
 iwm9000fw_type="firmware"
diff --git a/stand/defaults/loader.conf.5 b/stand/defaults/loader.conf.5
index 807d8ae62e9a..021f68f2309e 100644
--- a/stand/defaults/loader.conf.5
+++ b/stand/defaults/loader.conf.5
@@ -1,530 +1,536 @@
 .\" Copyright (c) 1999 Daniel C. Sobral
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
-.Dd February 9, 2025
+.Dd June 5, 2025
 .Dt LOADER.CONF 5
 .Os
 .Sh NAME
 .Nm loader.conf
 .Nd "system bootstrap configuration information"
 .Sh DESCRIPTION
 The file
 .Nm
 contains descriptive information on bootstrapping the system.
 Through
 it you can specify the kernel to be booted, parameters to be passed to
 it, and additional modules to be loaded; and generally set all variables
 described in
 .Xr loader 8 .
 .Sh SYNTAX
 Though
 .Nm Ns 's
 format was defined explicitly to resemble
 .Xr rc.conf 5 ,
 and can be sourced by
 .Xr sh 1 ,
 some settings are treated in a special fashion.
 Also, the
 behavior of some settings is defined by the setting's suffix;
 the prefix identifies which module the setting controls.
 .Pp
 The general parsing rules are:
 .Bl -bullet
 .It
 Spaces and empty lines are ignored.
 .It
 A # sign will mark the remainder of the line as a comment.
 .It
 Only one setting can be present on each line.
 .El
 .Pp
 All settings have the following format:
 .Pp
 .Dl variable="value"
 .Pp
 Unless it belongs to one of the classes of settings that receive special
 treatment, a setting will set the value of a
 .Xr loader 8
 environment variable.
 The settings that receive special
 treatment are listed below.
 Settings beginning with
 .Qq *
 below define the modules to be loaded and
 may have any prefix; the prefix identifies a module.
 All such settings sharing a common
 prefix refer to the same module.
 .Bl -tag -width Ar
 .It Ar autoboot_delay
 Delay in seconds before automatically booting.
 A user with console access will be able to interrupt the
 .Ic autoboot
 process and escape into the interactive mode by pressing a key on
 the console during this delay.
 .Pp
 If set to
 .Dq Li NO ,
 no
 .Ic autoboot
 is automatically attempted after processing
 .Pa /boot/loader.rc ,
 though explicit
 .Ic autoboot Ns 's
 are processed normally, using a 10 second delay.
 .Pp
 If set to
 .Dq Li 0 ,
 no delay is inserted, but any keys pressed while the kernel and modules are
 loaded will enter interactive mode.
 .Pp
 If set to
 .Dq Li -1 ,
 no delay will be inserted and
 .Nm
 starts interactive mode only if
 .Ic autoboot
 has failed.
 In combination with the
 .Va beastie_disable
 option, this option prevents users with console access from being able
 to interrupt the
 .Ic autoboot
 process and escape to the loader prompt.
 To use the
 .Va autoboot_delay
 option in this manner,
 .Va beastie_disable
 must be set to
 .Dq Li YES .
 .It Ar boot_*
 See list in
 .Xr loader.efi 8
 since those flags apply to all boot loaders.
 .It Ar boot_verbose
 Set to "yes" to get the same effect as boot -v or booting verbose from the
 loader menu.
 .It Ar exec
 Immediately executes a
 .Xr loader 8
 command.
 This type of setting cannot be processed by programs other
 than
 .Xr loader 8 ,
 so its use should be avoided.
 Multiple instances of it will be processed
 independently.
 .It Ar loader_conf_dirs
 Space separated list of directories to process for configuration files.
 The lua-based loader will process files with a
 .Dq .conf
 suffix that are placed in these directories.
 Files found here are processed after the ones listed in
 .Va loader_conf_files
 but before the ones found in
 .Va local_loader_conf_files .
 .It Ar loader_conf_files
 Defines additional configuration files to be processed right after the
 present file.
 .Ar loader_conf_files
 should be treated as write-only.
 One cannot depend on any value remaining in the loader environment or carried
 over into the kernel environment.
 .It Ar local_loader_conf_files
 Space separated list of additional configuration files to be processed at last,
 i.e., after
 .Va loader_conf_files
 and
 .Va loader_conf_dirs
 are processed.
 .It Ar product_vars
 When set, must be a space separated list of environment variable names to walk
 through to guess product information.
 The order matters as reading a config file override the previously defined
 values.
 Undefined variables are silently ignored.
 .Pp
 When product information can be guessed, for each product information found,
 append
 .Pa /boot/loader.conf.d/PRODUCT
 to
 .Ar loader_conf_dirs .
 It can be typically used as follow:
 .Bd -literal
 smbios.system.planar.maker="PLANAR_MAKER"
 smbios.system.planar.product="PLANAR_PRODUCT"
 smbios.system.product="PRODUCT"
 uboot.m_product="M_PRODUCT"
 product_vars="smbios.system.planar.maker smbios.system.planar.product smbios.system.product uboot.m_product"
 .Ed
 .Pp
 to read files found in the following directories, in that order:
 .Bl -bullet -compact
 .It
 .Pa /boot/loader.conf.d/PLANAR_MAKER
 .It
 .Pa /boot/loader.conf.d/PLANAR_PRODUCT
 .It
 .Pa /boot/loader.conf.d/PRODUCT
 .It
 .Pa /boot/loader.conf.d/M_PRODUCT
 .El
 .It Ar kernel
 Name of the kernel to be loaded.
 If no kernel name is set, no additional
 modules will be loaded.
 The name must be a subdirectory of
 .Pa /boot
 that contains a kernel.
 .It Ar kernel_options
 Flags to be passed to the kernel.
 .It Ar vfs.root.mountfrom
 Specify the root partition to mount.
 For example:
 .Pp
 .Dl vfs.root.mountfrom="ufs:/dev/da0s1a"
 .Pp
 .Xr loader 8
 automatically calculates the value of this tunable from
 .Pa /etc/fstab
 from the partition the kernel was loaded from.
 The calculated value might be calculated incorrectly when
 .Pa /etc/fstab
 is not available during
 .Xr loader 8
 startup (as during diskless booting from NFS), or if a different
 device is desired by the user.
 The preferred value can be set in
 .Pa /loader.conf .
 .Pp
 The value can also be overridden from the
 .Xr loader 8
 command line.
 This is useful for system recovery when
 .Pa /etc/fstab
 is damaged, lost, or read from the wrong partition.
 .It Ar password
 Protect boot menu with a password without interrupting
 .Ic autoboot
 process.
 The password should be in clear text format.
 If a password is set, boot menu will not appear until any key is pressed during
 countdown period specified by
 .Va autoboot_delay
 variable or
 .Ic autoboot
 process fails.
 In both cases user should provide specified password to be able to access boot
 menu.
 .It Ar bootlock_password
 Provides a password to be required by check-password before execution is
 allowed to continue.
 The password should be in clear text format.
 If a password is set, the user must provide specified password to boot.
 .It Ar verbose_loading
 If set to
 .Dq YES ,
 module names will be displayed as they are loaded.
 .It Ar module_blacklist
 Blacklist of modules.
 Modules specified in the blacklist may not be loaded automatically with a
 .Ar *_load
 directive, but they may be loaded directly at the
 .Xr loader 8
 prompt.
 Blacklisted modules may still be loaded indirectly as dependencies of other
 modules.
 .It Ar *_load
 If set to
 .Dq YES ,
 that module will be loaded.
 If no name is defined (see below), the
 module's name is taken to be the same as the prefix.
 .It Ar *_name
 Defines the name of the module.
 .It Ar *_type
 Defines the module's type.
 If none is given, it defaults to a kld module.
 .It Ar *_flags
 Flags and parameters to be passed to the module.
 .It Ar *_before
 Commands to be executed before the module is loaded.
 Use of this setting
 should be avoided.
 .It Ar *_after
 Commands to be executed after the module is loaded.
 Use of this setting
 should be avoided.
 .It Ar *_error
 Commands to be executed if the loading of a module fails.
 Except for the
 special value
 .Dq abort ,
 which aborts the bootstrap process, use of this setting should be avoided.
 .El
 .Pp
 .Em WARNING :
 developers should never use these suffixes for any kernel environment
 variables (tunables) or conflicts will result.
 .Sh DEFAULT SETTINGS
 Most of
 .Nm Ns 's
 default settings can be ignored.
 The few of them which are important
 or useful are:
 .Bl -tag -width bootfile -offset indent
 .It Va local_loader_conf_files
 .Pq Dq /boot/loader.conf.local
 Ensure
 .Va loader.conf.local
 can always be used to override settings from files found in
 .Va loader_conf_files
 and
 .Va loader_conf_dirs .
 .It Va bitmap_load
 .Pq Dq NO
 If set to
 .Dq YES ,
 a bitmap will be loaded to be displayed on screen while booting.
 .It Va bitmap_name
 .Pq Dq Pa /boot/splash.bmp
 Name of the bitmap to be loaded.
 Any other name can be used.
 .It Va comconsole_speed
 .Dq ( 115200
 or the value of the
 .Va BOOT_COMCONSOLE_SPEED
 variable when
 .Xr loader 8
 was compiled).
 Sets the speed of the serial console.
 If the previous boot loader stage specified that a serial console
 is in use then the default speed is determined from the current
 serial port speed setting.
 .It Va console
 .Pq Dq vidconsole
 .Dq comconsole
 selects serial console,
 .Dq vidconsole
 selects the video console,
 .Dq efi
 selects the EFI console,
 .Dq nullconsole
 selects a mute console
 (useful for systems with neither a video console nor a serial port), and
 .Dq spinconsole
 selects the video console which prevents any input and hides all output
 replacing it with
 .Dq spinning
 character (useful for embedded products and such).
 .It Va screen.font
 Set font size for framebuffer mode.
 The default font size is selected based on screen resolution.
 Note that the terminal's size may vary.
 .It Va screen.textmode
 Value
 .Dq 0
 will trigger BIOS loader to switch to use VESA BIOS Extension (VBE)
 frame buffer mode for console.
 The same effect can be achieved by setting
 .Va vbe_max_resolution .
 .Pp
 Value
 .Dq 1
 will force BIOS loader to use VGA text mode.
 .Pp
 If
 .Va vbe_max_resolution
 is not set, the loader will try to set screen resolution based on EDID
 information.
 If EDID is not available, the default resolution is 800x600 (if available).
 .It Va screen.height
 .It Va screen.width
 .It Va screen.depth
 .Va screen.height ,
 .Va screen.width ,
 .Va screen.depth
 are set by loader when loader is using framebuffer mode to draw the screen.
 .It Va efi_max_resolution
 .It Va vbe_max_resolution
 Specify the maximum desired resolution for the EFI or VBE framebuffer console.
 The following values are accepted:
 .Bl -column "WidthxHeight"
 .It Sy Value Ta Sy Resolution
 .It 480p Ta 640x480
 .It 720p Ta 1280x720
 .It 1080p Ta 1920x1080
 .It 1440p Ta 2560x1440
 .It 2160p Ta 3840x2160
 .It 4k Ta 3840x2160
 .It 5k Ta 5120x2880
 .It Va Width Ns x Ns Va Height Ta Va Width Ns x Ns Va Height
 .El
 .It Va kernel
 .Pq Dq kernel
 .It Va kernels
 .Pq Dq kernel kernel.old
 Space or comma separated list of kernels to present in the boot menu.
 .It Va loader_conf_files
 .Pq Dq Pa /boot/loader.conf /boot/loader.conf.local
 .It Va loader_conf_dirs
 .Pq Dq Pa /boot/loader.conf.d
 .It Va splash_bmp_load
 .Pq Dq NO
 If set to
 .Dq YES ,
 will load the splash screen module, making it possible to display a bmp image
 on the screen while booting.
 .It Va splash_pcx_load
 .Pq Dq NO
 If set to
 .Dq YES ,
 will load the splash screen module, making it possible to display a pcx image
 on the screen while booting.
 .It Va vesa_load
 .Pq Dq NO
 If set to
 .Dq YES ,
 the vesa module will be loaded, enabling bitmaps above VGA resolution to
 be displayed.
 .It Va beastie_disable
 If set to
 .Dq YES ,
 the beastie boot menu will be skipped.
 .It Va loader_autoboot_show Pq Dq Li YES
 If set to
 .Dq NO ,
 the autoboot menu will not be displayed
+.It Va loader_gfx
+If set to
+.Dq NO ,
+the ASCII art version of the brand and logo will be used even if graphical
+versions are available.
+Additionally, the menu frame will be drawn with ASCII art as well.
 .It Va loader_logo Pq Dq Li orbbw
 Selects a desired logo in the beastie boot menu.
 Possible values are:
 .Dq Li orbbw ,
 .Dq Li orb ,
 .Dq Li fbsdbw ,
 .Dq Li beastiebw ,
 .Dq Li beastie ,
 and
 .Dq Li none .
 .It Va loader_menu
 If set to
 .Dq NONE ,
 the menu will not be displayed
 .It Va loader_color
 If set to
 .Dq NO ,
 the beastie boot menu will be displayed without ANSI coloring.
 .It Va entropy_cache_load
 .Pq Dq YES
 If set to
 .Dq NO ,
 the very early
 boot-time entropy file
 will not be loaded.
 See the entropy entries in
 .Xr rc.conf 5 .
 .It Va entropy_cache_name
 .Pq Dq /boot/entropy
 The name of the very early
 boot-time entropy cache file.
 .It Va cpu_microcode_load
 .Pq Dq NO
 If set to
 .Dq YES ,
 the microcode update file specified by
 .Va cpu_microcode_name
 will be loaded and applied very early during boot.
 This provides functionality similar to
 .Xr cpucontrol 8
 but ensures that CPU features enabled by microcode updates can be
 used by the kernel.
 The update will be re-applied automatically when resuming from an
 ACPI sleep state.
 If the update file contains updates for multiple processor models,
 the kernel will search for and extract a matching update.
 Currently this setting is supported only on Intel
 .Dv i386
 and
 .Dv amd64
 processors.
 It has no effect on other processor types.
 .It Va cpu_microcode_name
 A path to a microcode update file.
 .El
 .Sh OTHER SETTINGS
 Other settings that may be used in
 .Nm
 that have no default value:
 .Bl -tag -width bootfile -offset indent
 .It Va fdt_overlays
 Specifies a comma-delimited list of FDT overlays to apply.
 .Pa /boot/dtb/overlays
 is created by default for overlays to be placed in.
 .It Va kernels_autodetect
 If set to
 .Dq YES ,
 attempt to auto-detect kernels installed in
 .Pa /boot .
 This is an option specific to the Lua-based loader.
 It is not available in the default Forth-based loader.
 .El
 .Sh FILES
 .Bl -tag -width /boot/defaults/loader.conf -compact
 .It Pa /boot/defaults/loader.conf
 Default settings \(em do not change this file.
 .It Pa /boot/loader.conf
 User defined settings.
 .It Pa /boot/loader.conf.lua
 User defined settings written in lua.
 .It Pa /boot/loader.conf.d/*.conf
 User defined settings split in separate files.
 .It Pa /boot/loader.conf.d/*.lua
 User defined settings written in lua and split in separate files.
 .It Pa /boot/loader.conf.local
 Machine-specific settings for sites with a common loader.conf. Allow to override
 settings defined in other files.
 .El
 .Sh SEE ALSO
 .Xr kenv 1 ,
 .Xr loader.conf.lua 5 ,
 .Xr rc.conf 5 ,
 .Xr boot 8 ,
 .Xr cpucontrol 8 ,
 .Xr loader 8 ,
 .Xr loader.4th 8
 .Sh HISTORY
 The file
 .Nm
 first appeared in
 .Fx 3.2 .
 .Sh AUTHORS
 This manual page was written by
 .An Daniel C. Sobral Aq dcs@FreeBSD.org .
 .Sh BUGS
 The
 .Xr loader 8
 stops reading
 .Nm
 when it encounters a syntax error, so any options which are vital for
 booting a particular system (i.e.,
 .Dq Va hw.ata.ata_dma Ns "=0" )
 should precede any experimental additions to
 .Nm .
diff --git a/stand/lua/drawer.lua b/stand/lua/drawer.lua
index ee33ae753916..d4c6bf850e86 100644
--- a/stand/lua/drawer.lua
+++ b/stand/lua/drawer.lua
@@ -1,566 +1,566 @@
 --
 -- SPDX-License-Identifier: BSD-2-Clause
 --
 -- Copyright (c) 2015 Pedro Souza <pedrosouza@freebsd.org>
 -- Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
 -- modification, are permitted provided that the following conditions
 -- are met:
 -- 1. Redistributions of source code must retain the above copyright
 --    notice, this list of conditions and the following disclaimer.
 -- 2. Redistributions in binary form must reproduce the above copyright
 --    notice, this list of conditions and the following disclaimer in the
 --    documentation and/or other materials provided with the distribution.
 --
 -- THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 -- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 -- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 -- ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 -- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 -- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 -- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 -- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 -- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 -- SUCH DAMAGE.
 --
 
 local color = require("color")
 local config = require("config")
 local core = require("core")
 local screen = require("screen")
 
 local drawer = {}
 
 local fbsd_brand
 local none
 
 local menu_name_handlers
 local branddefs
 local logodefs
 local brand_position
 local logo_position
 local menu_position
 local frame_size
 local default_shift
 local shift
 
 -- Make this code compatible with older loader binaries. We moved the term_*
 -- functions from loader to the gfx. if we're running on an older loader that
 -- has these functions, create aliases for them in gfx. The loader binary might
 -- be so old as to not have them, but in that case, we want to copy the nil
 -- values. The new loader will provide loader.* versions of all the gfx.*
 -- functions for backwards compatibility, so we only define the functions we use
 -- here.
 if gfx == nil then
 	gfx = {}
 	gfx.term_drawrect = loader.term_drawrect
 	gfx.term_putimage = loader.term_putimage
 end
 
 local function menuEntryName(drawing_menu, entry)
 	local name_handler = menu_name_handlers[entry.entry_type]
 
 	if name_handler ~= nil then
 		return name_handler(drawing_menu, entry)
 	end
 	if type(entry.name) == "function" then
 		return entry.name()
 	end
 	return entry.name
 end
 
 local function processFile(gfxname)
 	if gfxname == nil then
 		return false, "Missing filename"
 	end
 
 	local ret = try_include('gfx-' .. gfxname)
 	if ret == nil then
 		return false, "Failed to include gfx-" .. gfxname
 	end
 
 	-- Legacy format
 	if type(ret) ~= "table" then
 		return true
 	end
 
 	for gfxtype, def in pairs(ret) do
 		if gfxtype == "brand" then
 			drawer.addBrand(gfxname, def)
 		elseif gfxtype == "logo" then
 			drawer.addLogo(gfxname, def)
 		else
 			return false, "Unknown graphics type '" .. gfxtype ..
 			    "'"
 		end
 	end
 
 	return true
 end
 
 local function getBranddef(brand)
 	if brand == nil then
 		return nil
 	end
 	-- Look it up
 	local branddef = branddefs[brand]
 
 	-- Try to pull it in
 	if branddef == nil then
 		local res, err = processFile(brand)
 		if not res then
 			-- This fallback should go away after FreeBSD 13.
 			try_include('brand-' .. brand)
 			-- If the fallback also failed, print whatever error
 			-- we encountered in the original processing.
 			if branddefs[brand] == nil then
 				print(err)
 				return nil
 			end
 		end
 
 		branddef = branddefs[brand]
 	end
 
 	return branddef
 end
 
 local function getLogodef(logo)
 	if logo == nil then
 		return nil
 	end
 	-- Look it up
 	local logodef = logodefs[logo]
 
 	-- Try to pull it in
 	if logodef == nil then
 		local res, err = processFile(logo)
 		if not res then
 			-- This fallback should go away after FreeBSD 13.
 			try_include('logo-' .. logo)
 			-- If the fallback also failed, print whatever error
 			-- we encountered in the original processing.
 			if logodefs[logo] == nil then
 				print(err)
 				return nil
 			end
 		end
 
 		logodef = logodefs[logo]
 	end
 
 	return logodef
 end
 
 local function draw(x, y, logo)
 	for i = 1, #logo do
 		screen.setcursor(x, y + i - 1)
 		printc(logo[i])
 	end
 end
 
 local function drawmenu(menudef)
 	local x = menu_position.x
 	local y = menu_position.y
 
 	if string.lower(loader.getenv("loader_menu") or "") == "none" then
 	   return
 	end
 
 	x = x + shift.x
 	y = y + shift.y
 
 	-- print the menu and build the alias table
 	local alias_table = {}
 	local entry_num = 0
 	local menu_entries = menudef.entries
 	local effective_line_num = 0
 	if type(menu_entries) == "function" then
 		menu_entries = menu_entries()
 	end
 	for _, e in ipairs(menu_entries) do
 		-- Allow menu items to be conditionally visible by specifying
 		-- a visible function.
 		if e.visible ~= nil and not e.visible() then
 			goto continue
 		end
 		effective_line_num = effective_line_num + 1
 		if e.entry_type ~= core.MENU_SEPARATOR then
 			entry_num = entry_num + 1
 			screen.setcursor(x, y + effective_line_num)
 
 			printc(entry_num .. ". " .. menuEntryName(menudef, e))
 
 			-- fill the alias table
 			alias_table[tostring(entry_num)] = e
 			if e.alias ~= nil then
 				for _, a in ipairs(e.alias) do
 					alias_table[a] = e
 				end
 			end
 		else
 			screen.setcursor(x, y + effective_line_num)
 			printc(menuEntryName(menudef, e))
 		end
 		::continue::
 	end
 	return alias_table
 end
 
 local function defaultframe()
 	if core.isSerialConsole() then
 		return "ascii"
 	end
 	return "double"
 end
 
+local function gfxenabled()
+	return (loader.getenv("loader_gfx") or "yes"):lower() ~= "no"
+end
+local function gfxcapable()
+	return core.isFramebufferConsole() and gfx.term_putimage
+end
+
 local function drawframe()
 	local x = menu_position.x - 3
 	local y = menu_position.y - 1
 	local w = frame_size.w
 	local h = frame_size.h
 
 	local framestyle = loader.getenv("loader_menu_frame") or defaultframe()
 	local framespec = drawer.frame_styles[framestyle]
 	-- If we don't have a framespec for the current frame style, just don't
 	-- draw a box.
 	if framespec == nil then
 		return false
 	end
 
 	local hl = framespec.horizontal
 	local vl = framespec.vertical
 
 	local tl = framespec.top_left
 	local bl = framespec.bottom_left
 	local tr = framespec.top_right
 	local br = framespec.bottom_right
 
 	x = x + shift.x
 	y = y + shift.y
 
-	if core.isFramebufferConsole() and gfx.term_drawrect ~= nil then
+	if gfxenabled() and gfxcapable() then
 		gfx.term_drawrect(x, y, x + w, y + h)
 		return true
 	end
 
 	screen.setcursor(x, y); printc(tl)
 	screen.setcursor(x, y + h); printc(bl)
 	screen.setcursor(x + w, y); printc(tr)
 	screen.setcursor(x + w, y + h); printc(br)
 
 	screen.setcursor(x + 1, y)
 	for _ = 1, w - 1 do
 		printc(hl)
 	end
 
 	screen.setcursor(x + 1, y + h)
 	for _ = 1, w - 1 do
 		printc(hl)
 	end
 
 	for i = 1, h - 1 do
 		screen.setcursor(x, y + i)
 		printc(vl)
 		screen.setcursor(x + w, y + i)
 		printc(vl)
 	end
 	return true
 end
 
 local function drawbox()
 	local x = menu_position.x - 3
 	local y = menu_position.y - 1
 	local w = frame_size.w
 	local menu_header = loader.getenv("loader_menu_title") or
 	    "Welcome to FreeBSD"
 	local menu_header_align = loader.getenv("loader_menu_title_align")
 	local menu_header_x
 
 	if string.lower(loader.getenv("loader_menu") or "") == "none" then
 	   return
 	end
 
 	x = x + shift.x
 	y = y + shift.y
 
 	if drawframe(x, y, w) == false then
 		return
 	end
 
 	if menu_header_align ~= nil then
 		menu_header_align = menu_header_align:lower()
 		if menu_header_align == "left" then
 			-- Just inside the left border on top
 			menu_header_x = x + 1
 		elseif menu_header_align == "right" then
 			-- Just inside the right border on top
 			menu_header_x = x + w - #menu_header
 		end
 	end
 	if menu_header_x == nil then
 		menu_header_x = x + (w // 2) - (#menu_header // 2)
 	end
 	screen.setcursor(menu_header_x - 1, y)
 	if menu_header ~= "" then
 		printc(" " .. menu_header .. " ")
 	end
 
 end
 
 local function drawbrand()
 	local x = tonumber(loader.getenv("loader_brand_x")) or
 	    brand_position.x
 	local y = tonumber(loader.getenv("loader_brand_y")) or
 	    brand_position.y
 
 	local branddef = getBranddef(loader.getenv("loader_brand"))
 
 	if branddef == nil then
 		branddef = getBranddef(drawer.default_brand)
 	end
 
 	local graphic = branddef.graphic
 
 	x = x + shift.x
 	y = y + shift.y
 	if branddef.shift ~= nil then
 		x = x +	branddef.shift.x
 		y = y + branddef.shift.y
 	end
 
-	if core.isFramebufferConsole() and
-	    gfx.term_putimage ~= nil and
-	    branddef.image ~= nil then
-		if gfx.term_putimage(branddef.image, x, y, 0, 7, 0)
-		then
+	local gfx_requested = branddef.image and gfxenabled()
+	if gfx_requested and gfxcapable() then
+		if gfx.term_putimage(branddef.image, x, y, 0, 7, 0) then
 			return true
 		end
 	end
 	draw(x, y, graphic)
 end
 
 local function drawlogo()
 	local x = tonumber(loader.getenv("loader_logo_x")) or
 	    logo_position.x
 	local y = tonumber(loader.getenv("loader_logo_y")) or
 	    logo_position.y
 
 	local logo = loader.getenv("loader_logo")
 	local colored = color.isEnabled()
 
 	local logodef = getLogodef(logo)
 
 	if logodef == nil or logodef.graphic == nil or
 	    (not colored and logodef.requires_color) then
 		-- Choose a sensible default
 		if colored then
 			logodef = getLogodef(drawer.default_color_logodef)
 		else
 			logodef = getLogodef(drawer.default_bw_logodef)
 		end
 
 		-- Something has gone terribly wrong.
 		if logodef == nil then
 			logodef = getLogodef(drawer.default_fallback_logodef)
 		end
 	end
 
 	if logodef ~= nil and logodef.graphic == none then
 		shift = logodef.shift
 	else
 		shift = default_shift
 	end
 
 	x = x + shift.x
 	y = y + shift.y
 
 	if logodef ~= nil and logodef.shift ~= nil then
 		x = x + logodef.shift.x
 		y = y + logodef.shift.y
 	end
 
-	if core.isFramebufferConsole() and
-	    gfx.term_putimage ~= nil and
-	    logodef.image ~= nil then
-		local y1 = 15
+	local gfx_requested = logodef.image and gfxenabled()
+	if gfx_requested and gfxcapable() then
+		local y1 = logodef.image_rl or 15
 
-		if logodef.image_rl ~= nil then
-			y1 = logodef.image_rl
-		end
-		if gfx.term_putimage(logodef.image, x, y, 0, y + y1, 0)
-		then
+		if gfx.term_putimage(logodef.image, x, y, 0, y + y1, 0) then
 			return true
 		end
 	end
 	draw(x, y, logodef.graphic)
 end
 
 local function drawitem(func)
 	local console = loader.getenv("console")
 
 	for c in string.gmatch(console, "%w+") do
 		loader.setenv("console", c)
 		func()
 	end
 	loader.setenv("console", console)
 end
 
 fbsd_brand = {
 "  ______               ____   _____ _____  ",
 " |  ____|             |  _ \\ / ____|  __ \\ ",
 " | |___ _ __ ___  ___ | |_) | (___ | |  | |",
 " |  ___| '__/ _ \\/ _ \\|  _ < \\___ \\| |  | |",
 " | |   | | |  __/  __/| |_) |____) | |__| |",
 " | |   | | |    |    ||     |      |      |",
 " |_|   |_|  \\___|\\___||____/|_____/|_____/ "
 }
 none = {""}
 
 menu_name_handlers = {
 	-- Menu name handlers should take the menu being drawn and entry being
 	-- drawn as parameters, and return the name of the item.
 	-- This is designed so that everything, including menu separators, may
 	-- have their names derived differently. The default action for entry
 	-- types not specified here is to use entry.name directly.
 	[core.MENU_SEPARATOR] = function(_, entry)
 		if entry.name ~= nil then
 			if type(entry.name) == "function" then
 				return entry.name()
 			end
 			return entry.name
 		end
 		return ""
 	end,
 	[core.MENU_CAROUSEL_ENTRY] = function(_, entry)
 		local carid = entry.carousel_id
 		local caridx = config.getCarouselIndex(carid)
 		local choices = entry.items
 		if type(choices) == "function" then
 			choices = choices()
 		end
 		if #choices < caridx then
 			caridx = 1
 		end
 		return entry.name(caridx, choices[caridx], choices)
 	end,
 }
 
 branddefs = {
 	-- Indexed by valid values for loader_brand in loader.conf(5). Valid
 	-- keys are: graphic (table depicting graphic)
 	["fbsd"] = {
 		graphic = fbsd_brand,
 		image = "/boot/images/freebsd-brand-rev.png",
 	},
 	["none"] = {
 		graphic = none,
 	},
 }
 
 logodefs = {
 	-- Indexed by valid values for loader_logo in loader.conf(5). Valid keys
 	-- are: requires_color (boolean), graphic (table depicting graphic), and
 	-- shift (table containing x and y).
 	["tribute"] = {
 		graphic = fbsd_brand,
 	},
 	["tributebw"] = {
 		graphic = fbsd_brand,
 	},
 	["none"] = {
 		graphic = none,
 		shift = {x = 17, y = 0},
 	},
 }
 
 brand_position = {x = 2, y = 1}
 logo_position = {x = 40, y = 10}
 menu_position = {x = 5, y = 10}
 frame_size = {w = 39, h = 14}
 default_shift = {x = 0, y = 0}
 shift = default_shift
 
 -- Module exports
 drawer.default_brand = 'fbsd'
 drawer.default_color_logodef = 'orb'
 drawer.default_bw_logodef = 'orbbw'
 -- For when things go terribly wrong; this def should be present here in the
 -- drawer module in case it's a filesystem issue.
 drawer.default_fallback_logodef = 'none'
 
 -- These should go away after FreeBSD 13; only available for backwards
 -- compatibility with old logo- files.
 function drawer.addBrand(name, def)
 	branddefs[name] = def
 end
 
 function drawer.addLogo(name, def)
 	logodefs[name] = def
 end
 
 drawer.frame_styles = {
 	-- Indexed by valid values for loader_menu_frame in loader.conf(5).
 	-- All of the keys appearing below must be set for any menu frame style
 	-- added to drawer.frame_styles.
 	["ascii"] = {
 		horizontal	= "-",
 		vertical	= "|",
 		top_left	= "+",
 		bottom_left	= "+",
 		top_right	= "+",
 		bottom_right	= "+",
 	},
 }
 
 if core.hasUnicode() then
 	-- unicode based framing characters
 	drawer.frame_styles["single"] = {
 		horizontal	= "\xE2\x94\x80",
 		vertical	= "\xE2\x94\x82",
 		top_left	= "\xE2\x94\x8C",
 		bottom_left	= "\xE2\x94\x94",
 		top_right	= "\xE2\x94\x90",
 		bottom_right	= "\xE2\x94\x98",
 	}
 	drawer.frame_styles["double"] = {
 		horizontal	= "\xE2\x95\x90",
 		vertical	= "\xE2\x95\x91",
 		top_left	= "\xE2\x95\x94",
 		bottom_left	= "\xE2\x95\x9A",
 		top_right	= "\xE2\x95\x97",
 		bottom_right	= "\xE2\x95\x9D",
 	}
 else
 	-- non-unicode cons25-style framing characters
 	drawer.frame_styles["single"] = {
 		horizontal	= "\xC4",
 		vertical	= "\xB3",
 		top_left	= "\xDA",
 		bottom_left	= "\xC0",
 		top_right	= "\xBF",
 		bottom_right	= "\xD9",
         }
 	drawer.frame_styles["double"] = {
 		horizontal	= "\xCD",
 		vertical	= "\xBA",
 		top_left	= "\xC9",
 		bottom_left	= "\xC8",
 		top_right	= "\xBB",
 		bottom_right	= "\xBC",
 	}
 end
 
 function drawer.drawscreen(menudef)
 	-- drawlogo() must go first.
 	-- it determines the positions of other elements
 	drawitem(drawlogo)
 	drawitem(drawbrand)
 	drawitem(drawbox)
 	return drawmenu(menudef)
 end
 
 return drawer