diff --git a/config/graphic b/config/graphic
index 8dbae84892..e2c123e4f2 100644
--- a/config/graphic
+++ b/config/graphic
@@ -1,10 +1,13 @@
-if [ "${OPENGL}" = no ]; then
+[ -z "${OPENGL}" ] && OPENGL="no"
+[ -z "${OPENGLES}" ] && OPENGLES="no"
+
+if [ "${OPENGL}" = "no" ]; then
   OPENGL_SUPPORT="no"
 else
   OPENGL_SUPPORT="yes"
 fi
 
-if [ "${OPENGLES}" = no ]; then
+if [ "${OPENGLES}" = "no" ]; then
   OPENGLES_SUPPORT="no"
 else
   OPENGLES_SUPPORT="yes"
@@ -127,7 +130,13 @@ get_graphicdrivers() {
     COMPOSITE_SUPPORT="yes"
   fi
 
+  # VDPAU Support depends on X11
+  if [ ! "${DISPLAYSERVER}" = "x11" ]; then
+    VDPAU_SUPPORT="no"
+  fi
+
   # remove duplicate entries
   GALLIUM_DRIVERS="$(echo ${GALLIUM_DRIVERS} | xargs -n1 | sort -u | xargs)"
+  GRAPHIC_DRIVERS="$(echo ${GRAPHIC_DRIVERS} | xargs -n1 | sort -u | xargs)"
   XORG_DRIVERS="$(echo ${XORG_DRIVERS} | xargs -n1 | sort -u | xargs)"
 }
diff --git a/config/show_config b/config/show_config
index 4a6e18a889..374aa67b36 100644
--- a/config/show_config
+++ b/config/show_config
@@ -5,110 +5,121 @@ show_config() {
   get_graphicdrivers
 
   dashes="==========================="
-  config_message="\n $dashes$dashes$dashes"
-  config_message+="\n Configuration for $DISTRONAME "
-  if [ "$OFFICIAL" = "yes" ]; then
+  config_message="\n ${dashes}${dashes}${dashes}"
+  config_message+="\n Configuration for ${DISTRONAME} "
+  if [ "${OFFICIAL}" = "yes" ]; then
     config_message+="(official)"
   else
     config_message+="(community)"
   fi
-  config_message+="\n $dashes$dashes$dashes"
+  config_message+="\n ${dashes}${dashes}${dashes}"
 
   # Build options
 
   config_message+="\n\n Buildsystem configuration:"
-  config_message+="\n $dashes$dashes"
+  config_message+="\n ${dashes}${dashes}"
 
-  config_message+="\n - CPU:\t\t\t\t\t $TARGET_CPU"
-  config_message+="\n - Kernel Architecture:\t\t\t $TARGET_KERNEL_ARCH"
-  config_message+="\n - Userland Architecture:\t\t $TARGET_ARCH"
-  config_message+="\n - FLOAT:\t\t\t\t $TARGET_FLOAT"
+  config_message+="\n - CPU:\t\t\t\t\t ${TARGET_CPU}"
+  config_message+="\n - Kernel Architecture:\t\t\t ${TARGET_KERNEL_ARCH}"
+  config_message+="\n - Userland Architecture:\t\t ${TARGET_ARCH}"
+  if [ -n "${TARGET_FLOAT}" ]; then
+    config_message+="\n - FLOAT:\t\t\t\t ${TARGET_FLOAT}"
+  fi
   if [ -n "${TARGET_FPU}" ]; then
     config_message+="\n - FPU:\t\t\t\t\t ${TARGET_FPU}"
   fi
-  config_message+="\n - CPU features:\t\t\t $TARGET_FEATURES"
-  config_message+="\n - LTO (Link Time Optimization) support: $LTO_SUPPORT"
-  config_message+="\n - GOLD (Google Linker) Support:\t $GOLD_SUPPORT"
-  config_message+="\n - LLVM support:\t\t\t $LLVM_SUPPORT"
+  config_message+="\n - CPU features:\t\t\t ${TARGET_FEATURES}"
+  config_message+="\n - LTO (Link Time Optimization) support: ${LTO_SUPPORT}"
+  config_message+="\n - GOLD (Google Linker) Support:\t ${GOLD_SUPPORT}"
+  config_message+="\n - LLVM support:\t\t\t ${LLVM_SUPPORT}"
   config_message+="\n - DEBUG:\t\t\t\t ${DEBUG:-no}"
-  config_message+="\n - CFLAGS:\t $TARGET_CFLAGS"
-  config_message+="\n - LDFLAGS:\t $TARGET_LDFLAGS"
+  config_message+="\n - CFLAGS:\t ${TARGET_CFLAGS}"
+  config_message+="\n - LDFLAGS:\t ${TARGET_LDFLAGS}"
 
   # Misc. hardware configuration
 
   config_message+="\n\n Misc. hardware configuration:"
-  config_message+="\n $dashes$dashes"
+  config_message+="\n ${dashes}${dashes}"
 
-  config_message+="\n - ALSA support:\t\t\t $ALSA_SUPPORT"
-  config_message+="\n - Pulseaudio support:\t\t\t $PULSEAUDIO_SUPPORT"
-  config_message+="\n - Bluetooth support:\t\t\t $BLUETOOTH_SUPPORT"
+  config_message+="\n - ALSA support:\t\t\t ${ALSA_SUPPORT}"
+  config_message+="\n - Pulseaudio support:\t\t\t ${PULSEAUDIO_SUPPORT}"
+  config_message+="\n - Bluetooth support:\t\t\t ${BLUETOOTH_SUPPORT}"
 
-  for config_driver in $ADDITIONAL_DRIVERS; do
-    config_message+="\n - Include driver:\t\t\t $config_driver"
+  for config_driver in ${ADDITIONAL_DRIVERS}; do
+    config_message+="\n - Include driver:\t\t\t ${config_driver}"
   done
 
-  if [ "$DRIVER_ADDONS_SUPPORT" = "yes" ]; then
-    for config_driver_addons in $DRIVER_ADDONS; do
-      config_message+="\n - Include driver add-ons:\t\t $config_driver_addons"
+  if [ "${DRIVER_ADDONS_SUPPORT}" = "yes" ]; then
+    for config_driver_addons in ${DRIVER_ADDONS}; do
+      config_message+="\n - Include driver add-ons:\t\t ${config_driver_addons}"
     done
   fi
 
-  for config_firmware in $FIRMWARE; do
-    config_message+="\n - Include firmware:\t\t\t $config_firmware"
+  for config_firmware in ${FIRMWARE}; do
+    config_message+="\n - Include firmware:\t\t\t ${config_firmware}"
   done
 
   # Misc. Filesystems
 
   config_message+="\n\n Misc. Filesystems:"
-  config_message+="\n $dashes$dashes"
+  config_message+="\n ${dashes}${dashes}"
 
-  config_message+="\n - Swap Support:\t\t\t $SWAP_SUPPORT"
-  if [ "$SWAP_SUPPORT" = "yes" ]; then
-    config_message+="\n   - Swapfile default size:\t\t $SWAPFILESIZE"
+  config_message+="\n - Swap Support:\t\t\t ${SWAP_SUPPORT}"
+  if [ "${SWAP_SUPPORT}" = "yes" ]; then
+    config_message+="\n   - Swapfile default size:\t\t ${SWAPFILESIZE}"
   fi
-  config_message+="\n - NTFS Support (via Fuse):\t\t $NTFS3G"
-  config_message+="\n - Install HFS Tools:\t\t\t $HFSTOOLS"
+  config_message+="\n - NTFS Support (via Fuse):\t\t ${NTFS3G}"
+  config_message+="\n - Install HFS Tools:\t\t\t ${HFSTOOLS}"
 
   # Network service configuration
 
   config_message+="\n\n Network service configuration:"
-  config_message+="\n $dashes$dashes"
+  config_message+="\n ${dashes}${dashes}"
 
-  config_message+="\n - Avahi (Zeroconf) support:\t\t $AVAHI_DAEMON"
-  config_message+="\n - NFS mounting support:\t\t $NFS_SUPPORT"
-  config_message+="\n - SAMBA mounting support:\t\t $SAMBA_SUPPORT"
-  config_message+="\n - SAMBA server support:\t\t $SAMBA_SERVER"
-  config_message+="\n - SFTP server support:\t\t\t $SFTP_SERVER"
-  config_message+="\n - OpenVPN support:\t\t\t $OPENVPN_SUPPORT"
-  config_message+="\n - WireGuard support:\t\t\t $WIREGUARD_SUPPORT"
+  config_message+="\n - Avahi (Zeroconf) support:\t\t ${AVAHI_DAEMON}"
+  config_message+="\n - NFS mounting support:\t\t ${NFS_SUPPORT}"
+  config_message+="\n - SAMBA mounting support:\t\t ${SAMBA_SUPPORT}"
+  config_message+="\n - SAMBA server support:\t\t ${SAMBA_SERVER}"
+  config_message+="\n - SFTP server support:\t\t\t ${SFTP_SERVER}"
+  config_message+="\n - OpenVPN support:\t\t\t ${OPENVPN_SUPPORT}"
+  config_message+="\n - WireGuard support:\t\t\t ${WIREGUARD_SUPPORT}"
 
   # Graphic configuration
 
   config_message+="\n\n Graphic configuration:"
-  config_message+="\n $dashes$dashes"
-
-  if [ "$DISPLAYSERVER" = "x11" ] ; then
-    config_message+="\n - Xorg Graphic Drivers:\t\t $GRAPHIC_DRIVERS"
-    config_message+="\n - XORG Composite support:\t\t $COMPOSITE_SUPPORT"
-    config_message+="\n - WindowManager:\t\t\t $WINDOWMANAGER"
+  config_message+="\n ${dashes}${dashes}"
+  config_message+="\n - Graphic Drivers:\t\t\t ${GRAPHIC_DRIVERS}"
+  config_message+="\n - Display Server:\t\t\t ${DISPLAYSERVER}"
+  if [ "${DISPLAYSERVER}" = "x11" ] ; then
+    for drv in ${XORG_DRIVERS}; do
+      XORG_DRIVERS_CONFIG+="xf86-video-${drv} "
+    done
+    config_message+="\n - X.Org Graphic Drivers:\t\t ${XORG_DRIVERS_CONFIG}"
+    config_message+="\n - X.Org Composite support:\t\t ${COMPOSITE_SUPPORT}"
   fi
-  config_message+="\n - OpenGL (GLX) support (provider):\t $OPENGL_SUPPORT ($OPENGL)"
-  config_message+="\n - OpenGLES support (provider):\t\t $OPENGLES_SUPPORT ($OPENGLES)"
-  config_message+="\n - VAAPI Support:\t\t\t $VAAPI_SUPPORT"
-  config_message+="\n - VDPAU Support:\t\t\t $VDPAU_SUPPORT"
+  config_message+="\n - Window Manager / Compositor:\t\t ${WINDOWMANAGER}"
+  config_message+="\n - OpenGL (GLX) support (provider):\t ${OPENGL_SUPPORT} (${OPENGL})"
+  config_message+="\n - OpenGL ES support (provider):\t ${OPENGLES_SUPPORT} (${OPENGLES})"
+
+  # Video Acceleration configuration
+
+  config_message+="\n\n Video Acceleration configuration:"
+  config_message+="\n ${dashes}${dashes}"
+  config_message+="\n - VA-API Support:\t\t\t ${VAAPI_SUPPORT}"
+  config_message+="\n - VDPAU Support:\t\t\t ${VDPAU_SUPPORT}"
 
   # OS configuration
 
   config_message+="\n\n OS configuration:"
-  config_message+="\n $dashes$dashes"
+  config_message+="\n ${dashes}${dashes}"
 
-  config_message+="\n - OEM Support:\t\t\t\t $OEM_SUPPORT"
-  config_message+="\n - Default ROOT Password:\t\t $ROOT_PASSWORD"
-  config_message+="\n - Bootloader:\t\t\t\t $BOOTLOADER"
-  config_message+="\n - UDevil support:\t\t\t $UDEVIL"
-  config_message+="\n - Installer support:\t\t\t $INSTALLER_SUPPORT"
-  for config_package in $ADDITIONAL_PACKAGES; do
-    config_message+="\n - Include package:\t\t\t $config_package"
+  config_message+="\n - OEM Support:\t\t\t\t ${OEM_SUPPORT}"
+  config_message+="\n - Default ROOT Password:\t\t ${ROOT_PASSWORD}"
+  config_message+="\n - Bootloader:\t\t\t\t ${BOOTLOADER}"
+  config_message+="\n - UDevil support:\t\t\t ${UDEVIL}"
+  config_message+="\n - Installer support:\t\t\t ${INSTALLER_SUPPORT}"
+  for config_package in ${ADDITIONAL_PACKAGES}; do
+    config_message+="\n - Include package:\t\t\t ${config_package}"
   done
 
   # Distribution specific configuration
@@ -123,10 +134,10 @@ show_config() {
     show_distro_config
   fi
 
-  config_message+="\n\n $dashes$dashes$dashes"
-  config_message+="\n End Configuration for $DISTRONAME"
-  config_message+="\n $dashes$dashes$dashes"
+  config_message+="\n\n ${dashes}${dashes}${dashes}"
+  config_message+="\n End Configuration for ${DISTRONAME}"
+  config_message+="\n ${dashes}${dashes}${dashes}"
   config_message+="\n\n\n"
 
-  echo -e "$config_message"
+  echo -e "${config_message}"
 }
diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options
index 9760c6d602..e0939356c4 100644
--- a/distributions/LibreELEC/options
+++ b/distributions/LibreELEC/options
@@ -208,9 +208,6 @@
 # build with installer (yes / no)
   INSTALLER_SUPPORT="yes"
 
-# Windowmanager to use (fluxbox / none)
-  WINDOWMANAGER="fluxbox"
-
 # build and install remote support (yes / no)
   REMOTE_SUPPORT="yes"
 
diff --git a/distributions/LibreELEC/show_config b/distributions/LibreELEC/show_config
index afa3f71aed..3b0bda9ef8 100644
--- a/distributions/LibreELEC/show_config
+++ b/distributions/LibreELEC/show_config
@@ -2,41 +2,41 @@ show_distro_config() {
   # Hardware decoder support
 
   config_message+="\n\n Kodi Hardware configuration:"
-  config_message+="\n $dashes$dashes"
+  config_message+="\n ${dashes}${dashes}"
 
-  config_message+="\n - Video Acceleration provider:\t\t $KODIPLAYER_DRIVER"
+  config_message+="\n - Video Acceleration provider:\t\t ${KODIPLAYER_DRIVER}"
 
   # Input device configuration
 
-  config_message+="\n - Remote support:\t\t\t $REMOTE_SUPPORT"
-  config_message+="\n - CEC Adapter support:\t\t\t $CEC_SUPPORT"
-  config_message+="\n - CEC Framework support:\t\t $CEC_FRAMEWORK_SUPPORT"
-  config_message+="\n - Kodi Joystick support:\t\t $JOYSTICK_SUPPORT"
+  config_message+="\n - Remote support:\t\t\t ${REMOTE_SUPPORT}"
+  config_message+="\n - CEC Adapter support:\t\t\t ${CEC_SUPPORT}"
+  config_message+="\n - CEC Framework support:\t\t ${CEC_FRAMEWORK_SUPPORT}"
+  config_message+="\n - Kodi Joystick support:\t\t ${JOYSTICK_SUPPORT}"
 
   # Kodi configuration
 
   config_message+="\n\n Kodi Software configuration:"
-  config_message+="\n $dashes$dashes"
+  config_message+="\n ${dashes}${dashes}"
 
-  config_message+="\n - Kodi Blu-ray support:\t\t $KODI_BLURAY_SUPPORT"
-  if [ "$KODI_BLURAY_SUPPORT" = "yes" ] ; then
-    config_message+="\n   - Blu-ray BD+ support:\t\t $BLURAY_BDPLUS_SUPPORT"
-    config_message+="\n   - Blu-ray AACS support:\t\t $BLURAY_AACS_SUPPORT"
+  config_message+="\n - Kodi Blu-ray support:\t\t ${KODI_BLURAY_SUPPORT}"
+  if [ "${KODI_BLURAY_SUPPORT}" = "yes" ] ; then
+    config_message+="\n   - Blu-ray BD+ support:\t\t ${BLURAY_BDPLUS_SUPPORT}"
+    config_message+="\n   - Blu-ray AACS support:\t\t ${BLURAY_AACS_SUPPORT}"
   fi
-  config_message+="\n - Kodi DVDCSS support:\t\t\t $KODI_DVDCSS_SUPPORT"
-  config_message+="\n - Kodi Airplay support:\t\t $KODI_AIRPLAY_SUPPORT"
-  config_message+="\n - Kodi Airtunes support:\t\t $KODI_AIRTUNES_SUPPORT"
-  config_message+="\n - Kodi NFS support:\t\t\t $KODI_NFS_SUPPORT"
-  config_message+="\n - Kodi MySQL support:\t\t\t $KODI_MYSQL_SUPPORT"
-  config_message+="\n - Kodi Optical Drive support:\t\t $KODI_OPTICAL_SUPPORT"
-  config_message+="\n - Kodi SAMBA client support:\t\t $KODI_SAMBA_SUPPORT"
-  config_message+="\n - Kodi UPNP support:\t\t\t $KODI_UPNP_SUPPORT"
-  config_message+="\n - Kodi Webserver support:\t\t $KODI_WEBSERVER_SUPPORT"
+  config_message+="\n - Kodi DVDCSS support:\t\t\t ${KODI_DVDCSS_SUPPORT}"
+  config_message+="\n - Kodi Airplay support:\t\t ${KODI_AIRPLAY_SUPPORT}"
+  config_message+="\n - Kodi Airtunes support:\t\t ${KODI_AIRTUNES_SUPPORT}"
+  config_message+="\n - Kodi NFS support:\t\t\t ${KODI_NFS_SUPPORT}"
+  config_message+="\n - Kodi MySQL support:\t\t\t ${KODI_MYSQL_SUPPORT}"
+  config_message+="\n - Kodi Optical Drive support:\t\t ${KODI_OPTICAL_SUPPORT}"
+  config_message+="\n - Kodi SAMBA client support:\t\t ${KODI_SAMBA_SUPPORT}"
+  config_message+="\n - Kodi UPNP support:\t\t\t ${KODI_UPNP_SUPPORT}"
+  config_message+="\n - Kodi Webserver support:\t\t ${KODI_WEBSERVER_SUPPORT}"
 
-  for config_skin in $SKINS; do
-    config_message+="\n - Include Skin:\t\t\t $config_skin"
+  for config_skin in ${SKINS}; do
+    config_message+="\n - Include Skin:\t\t\t ${config_skin}"
   done
 
-  config_message+="\n - Default Skin:\t\t\t $SKIN_DEFAULT"
-  config_message+="\n - Include extra fonts:\t\t\t $KODI_EXTRA_FONTS"
+  config_message+="\n - Default Skin:\t\t\t ${SKIN_DEFAULT}"
+  config_message+="\n - Include extra fonts:\t\t\t ${KODI_EXTRA_FONTS}"
 }
diff --git a/projects/Generic/devices/Generic/options b/projects/Generic/devices/Generic/options
index e8c1830201..ad64946caa 100644
--- a/projects/Generic/devices/Generic/options
+++ b/projects/Generic/devices/Generic/options
@@ -7,6 +7,9 @@
 # Displayserver to use (weston / x11 / no)
   DISPLAYSERVER="no"
 
+# Windowmanager to use (fluxbox / none)
+  WINDOWMANAGER="none"
+
 # KODI Player implementation to use (mesa / default)
   KODIPLAYER_DRIVER="mesa"
 
diff --git a/projects/Generic/devices/wayland/options b/projects/Generic/devices/wayland/options
index 5c937c0006..c9c0f1f332 100644
--- a/projects/Generic/devices/wayland/options
+++ b/projects/Generic/devices/wayland/options
@@ -7,6 +7,9 @@
 # Displayserver to use (weston / x11 / no)
   DISPLAYSERVER="weston"
 
+# Windowmanager to use (fluxbox / none)
+  WINDOWMANAGER="none"
+
 # KODI Player implementation to use (mesa / default)
   KODIPLAYER_DRIVER="mesa"
 
diff --git a/projects/Generic/devices/x11/options b/projects/Generic/devices/x11/options
index faeb0f0d86..9f0a2e7f71 100644
--- a/projects/Generic/devices/x11/options
+++ b/projects/Generic/devices/x11/options
@@ -7,6 +7,9 @@
 # Displayserver to use (weston / x11 / no)
   DISPLAYSERVER="x11"
 
+# Windowmanager to use (fluxbox / none)
+  WINDOWMANAGER="fluxbox"
+
 # KODI Player implementation to use (mesa / default)
   KODIPLAYER_DRIVER="default"