diff --git a/x11/sterm/Makefile b/x11/sterm/Makefile
index b2e73dbde376..53fee65fa827 100644
--- a/x11/sterm/Makefile
+++ b/x11/sterm/Makefile
@@ -1,72 +1,66 @@
 # Created by: Matthew Donovan <kitchetech@gmail.com>
 
 PORTNAME=	sterm
 DISTVERSION=	0.8.4
 CATEGORIES=	x11
 MASTER_SITES=	http://dl.suckless.org/st/
 DISTNAME=	st-${PORTVERSION}
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Simple X terminal
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
 USES=		pkgconfig xorg
 USE_XORG=	x11 xext xft
 
 PLIST_FILES=	bin/st man/man1/st.1.gz
 
 # This way we avoid running tic on st.info which does not work as expected.
 BINARY_ALIAS=	tic=true
 
 PORTDATA=	config.def.h st.info
 PORTDOCS=	FAQ LEGACY README TODO
 
-OPTIONS_DEFINE=	DOCS
-OPTIONS_RADIO=	PATCHES
-OPTIONS_RADIO_PATCHES=	OPEN_COPIED_URL SCROLLBACK SOLARIZED
-OPEN_COPIED_URL_DESC=	Open contents of the clipboard in a user-defined browser
+OPTIONS_DEFINE=	DOCS SCROLLBACK XRESOURCES
 SCROLLBACK_DESC=	Scroll back through terminal output
-SOLARIZED_DESC=	Use Solarized color scheme
-
-OPEN_COPIED_URL_PATCH_SITES=	https://st.suckless.org/patches/open_copied_url/
-OPEN_COPIED_URL_PATCHFILES=	st-openclipboard-20190202-3be4cf1.diff:-p1
+XRESOURCES_DESC=	Allow to handle settings from Xresources
 
 SCROLLBACK_PATCH_SITES=	https://st.suckless.org/patches/scrollback/
 SCROLLBACK_PATCHFILES=	st-scrollback-0.8.4.diff:-p1 \
 			st-scrollback-mouse-20191024-a2c479c.diff:-p1
 
-SOLARIZED_PATCH_SITES=	https://st.suckless.org/patches/solarized/
-SOLARIZED_PATCHFILES=	st-solarized-both-0.8.4.diff:-p1
+XRESOURCES_PATCH_SITES=	https://st.suckless.org/patches/xresources/
+XRESOURCES_PATCHFILES=	st-xresources-20200604-9ba7ecf.diff:-p1
 
 pre-everything::
 	@${ECHO_MSG} "You can build st with your own config.h using the ST_CONF knob:"
 	@${ECHO_MSG} "make ST_CONF=/path/to/st/config.h install clean"
 
 post-patch:
 .if defined(ST_CONF)
 	@${ECHO_MSG} "creating config.h from ${ST_CONF}"
 	@${LN} -sf ${ST_CONF} ${WRKSRC}/config.h
 .endif
 	@${REINPLACE_CMD} -e 's|^VERSION = .*|VERSION = ${PORTVERSION}|' \
 		-e 's|^PREFIX = .*|PREFIX = ${PREFIX}|' \
 		-e "s|^MANPREFIX = .*|MANPREFIX = ${MANPREFIX}/man|" \
 		-e "s|^X11INC = .*|X11INC = ${LOCALBASE}/include|" \
 		-e "s|^X11LIB = .*|X11LIB = ${LOCALBASE}/lib|" \
 		-e "s|^CPPFLAGS =|CPPFLAGS +=|" \
 		${WRKSRC}/config.mk
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/st
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDATA} ${STAGEDIR}${DATADIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11/sterm/distinfo b/x11/sterm/distinfo
index e7c593206066..9aeb9b618e0c 100644
--- a/x11/sterm/distinfo
+++ b/x11/sterm/distinfo
@@ -1,11 +1,9 @@
-TIMESTAMP = 1608642179
+TIMESTAMP = 1618581025
 SHA256 (st-0.8.4.tar.gz) = d42d3ceceb4d6a65e32e90a5336e3d446db612c3fbd9ebc1780bc6c9a03346a6
 SIZE (st-0.8.4.tar.gz) = 47330
-SHA256 (st-openclipboard-20190202-3be4cf1.diff) = e7a1a8dd90b30286236baafec2a00113aca21c91f4e9cbb2ec4a519f224274cb
-SIZE (st-openclipboard-20190202-3be4cf1.diff) = 1692
 SHA256 (st-scrollback-0.8.4.diff) = 418e1c5df11105482f13a008218c89eadb974630c25b4a6ff3da763dc2560e44
 SIZE (st-scrollback-0.8.4.diff) = 8904
 SHA256 (st-scrollback-mouse-20191024-a2c479c.diff) = 319458d980195d18fa0f81a6898d58f8d046c5ff982ab872d741f54bb60e267d
 SIZE (st-scrollback-mouse-20191024-a2c479c.diff) = 622
-SHA256 (st-solarized-both-0.8.4.diff) = 0dc844dc62872499c0c627054cebd2451c8cf0a22071425e7c499fab7b905263
-SIZE (st-solarized-both-0.8.4.diff) = 5214
+SHA256 (st-xresources-20200604-9ba7ecf.diff) = 5be9b40d2b51761685f6503e92028a7858cc6571a8867b88612fce8a70514d5b
+SIZE (st-xresources-20200604-9ba7ecf.diff) = 4840