diff --git a/packages/graphics/SDL2/package.mk b/packages/graphics/SDL2/package.mk
index fd508e8f5..e3b4a9586 100644
--- a/packages/graphics/SDL2/package.mk
+++ b/packages/graphics/SDL2/package.mk
@@ -7,12 +7,19 @@ PKG_VERSION="2.0.20"
 PKG_SHA256="c56aba1d7b5b0e7e999e4a7698c70b63a3394ff9704b5f6e1c57e0c16f04dd06"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.libsdl.org/"
-PKG_URL="https://www.libsdl.org/release/SDL2-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain alsa-lib systemd dbus ${OPENGLES} pulseaudio libdrm"
+PKG_URL="https://www.libsdl.org/release/SDL2-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain alsa-lib systemd dbus pulseaudio libdrm"
 PKG_LONGDESC="Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware."
 PKG_DEPENDS_HOST="toolchain:host distutilscross:host"
 PKG_PATCH_DIRS+="${DEVICE}"
 
+if [ ! "${OPENGL}" = "no" ]; then
+  PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd"
+fi
+
+if [ "${OPENGLES_SUPPORT}" = yes ]; then
+  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
+fi
 
 if [ "${ARCH}" = "arm" ] || [ "${ARCH}" = "aarch64" ]
 then
diff --git a/packages/graphics/libglvnd/package.mk b/packages/graphics/libglvnd/package.mk
index f329a0bf5..a275c91b9 100644
--- a/packages/graphics/libglvnd/package.mk
+++ b/packages/graphics/libglvnd/package.mk
@@ -17,10 +17,10 @@ configure_package() {
 }
 
 pre_configure_target(){
-  PKG_MESON_OPTS_TARGET="-Dgles1=false"
-
   if [ "${OPENGLES_SUPPORT}" = "no" ]; then
     PKG_MESON_OPTS_TARGET+=" -Dgles2=false"
+  else
+    PKG_MESON_OPTS_TARGET+=" -Dgles1=true -Dgles2=true"
   fi
 }
 
diff --git a/packages/jelos/package.mk b/packages/jelos/package.mk
index fddeb9630..a3a4bfdf8 100644
--- a/packages/jelos/package.mk
+++ b/packages/jelos/package.mk
@@ -7,13 +7,21 @@ PKG_ARCH="any"
 PKG_LICENSE="apache2"
 PKG_SITE=""
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain ${OPENGLES}"
+PKG_DEPENDS_TARGET="toolchain"
 PKG_SHORTDESC="JELOS Meta Package"
 PKG_LONGDESC="JELOS Meta Package"
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 PKG_TOOLCHAIN="make"
 
+if [ ! "${OPENGL}" = "no" ]; then
+  PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd"
+fi
+
+if [ "${OPENGLES_SUPPORT}" = yes ]; then
+  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
+fi
+
 PKG_BASEOS="plymouth-lite grep wget libjpeg-turbo util-linux xmlstarlet bluetool gnupg gzip patchelf \
             imagemagick terminus-font vim bash pyudev dialog six git dbus-python coreutils miniupnpc \
             nss-mdns avahi alsa-ucm-conf MC fbgrab modules"
diff --git a/packages/textproc/textviewer/package.mk b/packages/textproc/textviewer/package.mk
index 68d958318..c665e1048 100644
--- a/packages/textproc/textviewer/package.mk
+++ b/packages/textproc/textviewer/package.mk
@@ -6,11 +6,19 @@ PKG_VERSION="6820fd6e036e33f3d56b036978e6ec3c870c6b28"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/lethal-guitar/TvTextViewer"
 PKG_URL="$PKG_SITE.git"
-PKG_DEPENDS_TARGET="toolchain ${OPENGLES} SDL2"
+PKG_DEPENDS_TARGET="toolchain SDL2"
 PKG_SHORTDESC="Full-screen text viewer tool with gamepad controls"
 PKG_TOOLCHAIN="make"
 GET_HANDLER_SUPPORT="git"
 
+if [ ! "${OPENGL}" = "no" ]; then
+  PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd"
+fi
+
+if [ "${OPENGLES_SUPPORT}" = yes ]; then
+  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
+fi
+
 pre_patch() {
   find $(echo "${PKG_BUILD}" | cut -f1 -d\ ) -type f -exec dos2unix -q {} \;
 }
diff --git a/packages/ui/emulationstation/package.mk b/packages/ui/emulationstation/package.mk
index 55cfcfc49..2ed0a9f01 100644
--- a/packages/ui/emulationstation/package.mk
+++ b/packages/ui/emulationstation/package.mk
@@ -17,7 +17,7 @@ PKG_BUILD_FLAGS="-gold"
 GET_HANDLER_SUPPORT="git"
 
 if [ ! "${OPENGL}" = "no" ]; then
-  PKG_DEPENDS_TARGET+=" ${OPENGL} glu"
+  PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd"
 fi
 
 if [ "${OPENGLES_SUPPORT}" = yes ]; then
diff --git a/projects/PC/devices/X86_64/options b/projects/PC/devices/X86_64/options
index 98ad6f46a..b7a4d8ac8 100644
--- a/projects/PC/devices/X86_64/options
+++ b/projects/PC/devices/X86_64/options
@@ -8,7 +8,7 @@
   OPENGL="mesa"
 
 # OpenGL-ES implementation to use (mesa / no)
-  OPENGLES="mesa"
+  OPENGLES="no"
 
 # Vulkan implementation to use (vulkan-loader / no)
   VULKAN="vulkan-loader"
@@ -17,10 +17,10 @@
   VULKAN_SUPPORT="yes"
 
 # Displayserver to use (weston / x11 / no)
-  DISPLAYSERVER="weston"
+  DISPLAYSERVER="x11"
 
 # Windowmanager to use (fluxbox / weston / no)
-  WINDOWMANAGER="weston"
+  WINDOWMANAGER="fluxbox"
 
 # Mesa 3D Graphic drivers to use (all / crocus,i915,iris,r300,r600,radeonsi,vmware,virtio)
 # Space separated list is supported,