diff --git a/net-im/gotosocial/Makefile b/net-im/gotosocial/Makefile
index 418091ab64a3..6ba94eada124 100644
--- a/net-im/gotosocial/Makefile
+++ b/net-im/gotosocial/Makefile
@@ -1,61 +1,61 @@
 PORTNAME=	gotosocial
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.17.3
-PORTREVISION=	4
+DISTVERSION=	0.18.3
+PORTREVISION=	0
 CATEGORIES=	net-im
 MASTER_SITES?=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/v${DISTVERSION}/:web
 DISTFILES?=	${PORTNAME}_${DISTVERSION}_web-assets.tar.gz:web
 
 MAINTAINER=	freebsd@igalic.co
 COMMENT=	Golang fediverse server
 WWW=		https://docs.gotosocial.org/en/latest/
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv7 i386
 ONLY_FOR_ARCHS_REASON=	https://gitlab.com/cznic/libc/-/issues/15
 
 USES=		go:1.23,modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	superseriousbusiness
 USE_RC_SUBR=	${PORTNAME}
 
 GO_TARGET=	./cmd/gotosocial
 GO_BUILDFLAGS+=	-tags "netgo osusergo static_build kvformat ${WITH_DEBUG:Ddebugenv}" \
  	-ldflags="${STRIP} -w -extldflags '-static' -X 'main.Version=${PKGVERSION}'"
 CGO_ENABLED=	0
 
 SUB_LIST=	DBDIR="${DBDIR}" \
 		GROUP="${GROUPS}" \
 		USER="${USERS}" \
 		WWWDIR="${WWWDIR}"
 
 USERS=		gotosocial
 GROUPS=		gotosocial
 
 DBDIR=		/var/db/${PORTNAME}
 
 PLIST_SUB=	WWWDIR="${WWWDIR}"
 
 TESTING_UNSAFE=	FAIL    github.com/superseriousbusiness/gotosocial/internal/log
 
 post-patch:
 	${REINPLACE_CMD} -e 's,GTS_DB_TYPE="postgres",#&,' ${WRKSRC}/scripts/test.sh
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for x in LICENSE README.md
 	${INSTALL_DATA} ${WRKSRC}/${x} \
 		${STAGEDIR}${DOCSDIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/example/config.yaml \
 		${STAGEDIR}${ETCDIR}/config.yaml.sample
 	(cd ${WRKSRC}/../web && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/ )
 
 do-test:
 	(cd ${GO_WRKSRC}; \
 		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off scripts/test.sh)
 
 .include <bsd.port.mk>
diff --git a/net-im/gotosocial/distinfo b/net-im/gotosocial/distinfo
index 3aeb631c63e8..713a3f1237c0 100644
--- a/net-im/gotosocial/distinfo
+++ b/net-im/gotosocial/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1733217257
-SHA256 (gotosocial_0.17.3_web-assets.tar.gz) = f390a67168dc5fc6be859c64c914df5c4ae6908c7ae11dac71a692d85a5febaf
-SIZE (gotosocial_0.17.3_web-assets.tar.gz) = 1877114
-SHA256 (superseriousbusiness-gotosocial-v0.17.3_GH0.tar.gz) = a00382d31ec55fc26f94a611c599a00da98d8b4ea8447559781732f9ec6ebaf6
-SIZE (superseriousbusiness-gotosocial-v0.17.3_GH0.tar.gz) = 119491120
+TIMESTAMP = 1742813820
+SHA256 (gotosocial_0.18.3_web-assets.tar.gz) = eb46928961c71c3c59820adea935478a9d8b77f3f237d4f893e3468d7fce3507
+SIZE (gotosocial_0.18.3_web-assets.tar.gz) = 1899735
+SHA256 (superseriousbusiness-gotosocial-v0.18.3_GH0.tar.gz) = 759edb9f8f75f91962948e2373e74d19c97b13fb50e0a0b477188923512935d5
+SIZE (superseriousbusiness-gotosocial-v0.18.3_GH0.tar.gz) = 118425623
diff --git a/net-im/gotosocial/pkg-plist b/net-im/gotosocial/pkg-plist
index 56c7897985bc..e7f31d467b99 100644
--- a/net-im/gotosocial/pkg-plist
+++ b/net-im/gotosocial/pkg-plist
@@ -1,113 +1,120 @@
+bin/gotosocial
 @sample etc/gotosocial/config.yaml.sample
-%%WWWDIR%%/template/about.tmpl
-%%WWWDIR%%/template/thread.tmpl
-%%WWWDIR%%/template/oob.tmpl
-%%WWWDIR%%/template/profile.tmpl
-%%WWWDIR%%/template/status.tmpl
-%%WWWDIR%%/template/email_confirm.tmpl
-%%WWWDIR%%/template/email_reset.tmpl
-%%WWWDIR%%/template/email_test.tmpl
-%%WWWDIR%%/template/sign-in.tmpl
-%%WWWDIR%%/template/email_new_report.tmpl
-%%WWWDIR%%/template/email_report_closed.tmpl
-%%WWWDIR%%/template/index.tmpl
-%%WWWDIR%%/template/404.tmpl
-%%WWWDIR%%/template/error.tmpl
-%%WWWDIR%%/template/authorize.tmpl
-%%WWWDIR%%/template/domain-blocklist.tmpl
-%%WWWDIR%%/template/finalize.tmpl
-%%WWWDIR%%/template/tag.tmpl
-%%WWWDIR%%/template/status_attachments.tmpl
-%%WWWDIR%%/template/status_poll.tmpl
-%%WWWDIR%%/template/index_apps.tmpl
-%%WWWDIR%%/template/index_what_is_this.tmpl
-%%WWWDIR%%/template/page.tmpl
-%%WWWDIR%%/template/page_footer.tmpl
-%%WWWDIR%%/template/page_header.tmpl
-%%WWWDIR%%/template/page_ogmeta.tmpl
-%%WWWDIR%%/template/page_stylesheets.tmpl
-%%WWWDIR%%/template/profile_fields.tmpl
-%%WWWDIR%%/template/settings.tmpl
-%%WWWDIR%%/template/status_attributes.tmpl
-%%WWWDIR%%/template/status_header.tmpl
-%%WWWDIR%%/template/status_info.tmpl
-%%WWWDIR%%/template/confirm_email.tmpl
-%%WWWDIR%%/template/confirmed_email.tmpl
-%%WWWDIR%%/template/email_new_signup.tmpl
-%%WWWDIR%%/template/email_signup_approved.tmpl
-%%WWWDIR%%/template/email_signup_rejected.tmpl
-%%WWWDIR%%/template/index_register.tmpl
-%%WWWDIR%%/template/sign-up.tmpl
-%%WWWDIR%%/template/signed-up.tmpl
+%%DOCSDIR%%/LICENSE
+%%DOCSDIR%%/README.md
+%%WWWDIR%%/assets/Fork-Awesome/CONTRIBUTORS.md
+%%WWWDIR%%/assets/Fork-Awesome/LICENSES
+%%WWWDIR%%/assets/Fork-Awesome/css/fork-awesome.css
+%%WWWDIR%%/assets/Fork-Awesome/css/fork-awesome.min.css
+%%WWWDIR%%/assets/Fork-Awesome/css/fork-awesome.min.css.map
+%%WWWDIR%%/assets/Fork-Awesome/css/v5-compat.css
+%%WWWDIR%%/assets/Fork-Awesome/css/v5-compat.min.css
+%%WWWDIR%%/assets/Fork-Awesome/css/v5-compat.min.css.map
+%%WWWDIR%%/assets/Fork-Awesome/fonts/forkawesome-webfont.eot
+%%WWWDIR%%/assets/Fork-Awesome/fonts/forkawesome-webfont.svg
+%%WWWDIR%%/assets/Fork-Awesome/fonts/forkawesome-webfont.ttf
+%%WWWDIR%%/assets/Fork-Awesome/fonts/forkawesome-webfont.woff
+%%WWWDIR%%/assets/Fork-Awesome/fonts/forkawesome-webfont.woff2
 %%WWWDIR%%/assets/LICENSE
 %%WWWDIR%%/assets/activitypub_light.svg
-%%WWWDIR%%/assets/default_header.webp
 %%WWWDIR%%/assets/default_avatars/GoToSocial_icon1.webp
 %%WWWDIR%%/assets/default_avatars/GoToSocial_icon2.webp
 %%WWWDIR%%/assets/default_avatars/GoToSocial_icon3.webp
 %%WWWDIR%%/assets/default_avatars/GoToSocial_icon4.webp
 %%WWWDIR%%/assets/default_avatars/GoToSocial_icon5.webp
 %%WWWDIR%%/assets/default_avatars/GoToSocial_icon6.webp
-%%WWWDIR%%/assets/mastodon.svg
-%%WWWDIR%%/assets/logo.svg
-%%WWWDIR%%/assets/logo.webp
-%%WWWDIR%%/assets/plyr.svg
-%%WWWDIR%%/assets/fonts/OFL.txt
+%%WWWDIR%%/assets/default_header.webp
+%%WWWDIR%%/assets/dist/_colors.css
+%%WWWDIR%%/assets/dist/about.css
+%%WWWDIR%%/assets/dist/base.css
+%%WWWDIR%%/assets/dist/frontend.js
+%%WWWDIR%%/assets/dist/index.css
+%%WWWDIR%%/assets/dist/login-info.css
+%%WWWDIR%%/assets/dist/page.css
+%%WWWDIR%%/assets/dist/prism.css
+%%WWWDIR%%/assets/dist/profile.css
+%%WWWDIR%%/assets/dist/settings-style.css
+%%WWWDIR%%/assets/dist/settings.js
+%%WWWDIR%%/assets/dist/status.css
+%%WWWDIR%%/assets/dist/tag.css
+%%WWWDIR%%/assets/dist/thread.css
+%%WWWDIR%%/assets/ellipsis.svg
+%%WWWDIR%%/assets/feditext.svg
 %%WWWDIR%%/assets/fonts/Atkinson-Hyperlegible-Bold-102.woff
 %%WWWDIR%%/assets/fonts/Atkinson-Hyperlegible-Bold-102a.woff2
 %%WWWDIR%%/assets/fonts/Atkinson-Hyperlegible-BoldItalic-102.woff
 %%WWWDIR%%/assets/fonts/Atkinson-Hyperlegible-BoldItalic-102a.woff2
 %%WWWDIR%%/assets/fonts/Atkinson-Hyperlegible-Italic-102.woff
 %%WWWDIR%%/assets/fonts/Atkinson-Hyperlegible-Italic-102a.woff2
 %%WWWDIR%%/assets/fonts/Atkinson-Hyperlegible-Regular-102.woff
 %%WWWDIR%%/assets/fonts/Atkinson-Hyperlegible-Regular-102a.woff2
+%%WWWDIR%%/assets/fonts/OFL.txt
 %%WWWDIR%%/assets/fonts/noto-sans-mono-v30-latin-regular.woff2
 %%WWWDIR%%/assets/fonts/noto-sans-v27-latin-700.woff
 %%WWWDIR%%/assets/fonts/noto-sans-v27-latin-700.woff2
 %%WWWDIR%%/assets/fonts/noto-sans-v27-latin-regular.woff
 %%WWWDIR%%/assets/fonts/noto-sans-v27-latin-regular.woff2
-%%WWWDIR%%/assets/Fork-Awesome/CONTRIBUTORS.md
-%%WWWDIR%%/assets/Fork-Awesome/fonts/forkawesome-webfont.ttf
-%%WWWDIR%%/assets/Fork-Awesome/fonts/forkawesome-webfont.woff2
-%%WWWDIR%%/assets/Fork-Awesome/fonts/forkawesome-webfont.eot
-%%WWWDIR%%/assets/Fork-Awesome/fonts/forkawesome-webfont.svg
-%%WWWDIR%%/assets/Fork-Awesome/fonts/forkawesome-webfont.woff
-%%WWWDIR%%/assets/Fork-Awesome/LICENSES
-%%WWWDIR%%/assets/Fork-Awesome/css/fork-awesome.min.css.map
-%%WWWDIR%%/assets/Fork-Awesome/css/v5-compat.min.css
-%%WWWDIR%%/assets/Fork-Awesome/css/v5-compat.css
-%%WWWDIR%%/assets/Fork-Awesome/css/fork-awesome.css
-%%WWWDIR%%/assets/Fork-Awesome/css/v5-compat.min.css.map
-%%WWWDIR%%/assets/Fork-Awesome/css/fork-awesome.min.css
+%%WWWDIR%%/assets/logo.png
+%%WWWDIR%%/assets/logo.svg
+%%WWWDIR%%/assets/logo.webp
+%%WWWDIR%%/assets/mastodon.svg
+%%WWWDIR%%/assets/plyr.svg
+%%WWWDIR%%/assets/swagger.yaml
+%%WWWDIR%%/assets/themes/blurple-auto.css
 %%WWWDIR%%/assets/themes/blurple-dark.css
 %%WWWDIR%%/assets/themes/blurple-light.css
+%%WWWDIR%%/assets/themes/brutalist-auto.css
 %%WWWDIR%%/assets/themes/brutalist-dark.css
 %%WWWDIR%%/assets/themes/brutalist.css
 %%WWWDIR%%/assets/themes/ecks-pee.css
 %%WWWDIR%%/assets/themes/midnight-trip.css
 %%WWWDIR%%/assets/themes/moonlight-hunt.css
 %%WWWDIR%%/assets/themes/rain-forest.css
 %%WWWDIR%%/assets/themes/soft.css
+%%WWWDIR%%/assets/themes/solarized-auto.css
 %%WWWDIR%%/assets/themes/solarized-dark.css
 %%WWWDIR%%/assets/themes/solarized-light.css
 %%WWWDIR%%/assets/themes/sunset-light.css
 %%WWWDIR%%/assets/tusky.svg
-%%WWWDIR%%/assets/logo.png
-%%WWWDIR%%/assets/dist/index.css
-%%WWWDIR%%/assets/dist/profile.css
-%%WWWDIR%%/assets/dist/_colors.css
-%%WWWDIR%%/assets/dist/settings.js
-%%WWWDIR%%/assets/dist/status.css
-%%WWWDIR%%/assets/dist/settings-style.css
-%%WWWDIR%%/assets/dist/base.css
-%%WWWDIR%%/assets/dist/frontend.js
-%%WWWDIR%%/assets/dist/tag.css
-%%WWWDIR%%/assets/dist/about.css
-%%WWWDIR%%/assets/dist/page.css
-%%WWWDIR%%/assets/dist/prism.css
-%%WWWDIR%%/assets/dist/thread.css
-%%WWWDIR%%/assets/feditext.svg
-%%WWWDIR%%/assets/swagger.yaml
-bin/gotosocial
-share/doc/gotosocial/LICENSE
-share/doc/gotosocial/README.md
+%%WWWDIR%%/template/404.tmpl
+%%WWWDIR%%/template/about.tmpl
+%%WWWDIR%%/template/authorize.tmpl
+%%WWWDIR%%/template/confirm-email.tmpl
+%%WWWDIR%%/template/confirmed-email.tmpl
+%%WWWDIR%%/template/domain-blocklist.tmpl
+%%WWWDIR%%/template/email_confirm.tmpl
+%%WWWDIR%%/template/email_new_report.tmpl
+%%WWWDIR%%/template/email_new_signup.tmpl
+%%WWWDIR%%/template/email_report_closed.tmpl
+%%WWWDIR%%/template/email_reset.tmpl
+%%WWWDIR%%/template/email_signup_approved.tmpl
+%%WWWDIR%%/template/email_signup_rejected.tmpl
+%%WWWDIR%%/template/email_test.tmpl
+%%WWWDIR%%/template/error.tmpl
+%%WWWDIR%%/template/finalize.tmpl
+%%WWWDIR%%/template/index.tmpl
+%%WWWDIR%%/template/index_register.tmpl
+%%WWWDIR%%/template/index_what_is_this.tmpl
+%%WWWDIR%%/template/login-info.tmpl
+%%WWWDIR%%/template/login_button.tmpl
+%%WWWDIR%%/template/maintenance.tmpl
+%%WWWDIR%%/template/oob.tmpl
+%%WWWDIR%%/template/page.tmpl
+%%WWWDIR%%/template/page_footer.tmpl
+%%WWWDIR%%/template/page_header.tmpl
+%%WWWDIR%%/template/page_ogmeta.tmpl
+%%WWWDIR%%/template/page_stylesheets.tmpl
+%%WWWDIR%%/template/profile.tmpl
+%%WWWDIR%%/template/profile_fields.tmpl
+%%WWWDIR%%/template/settings.tmpl
+%%WWWDIR%%/template/sign-in.tmpl
+%%WWWDIR%%/template/sign-up.tmpl
+%%WWWDIR%%/template/signed-up.tmpl
+%%WWWDIR%%/template/status.tmpl
+%%WWWDIR%%/template/status_attachments.tmpl
+%%WWWDIR%%/template/status_attributes.tmpl
+%%WWWDIR%%/template/status_header.tmpl
+%%WWWDIR%%/template/status_info.tmpl
+%%WWWDIR%%/template/status_poll.tmpl
+%%WWWDIR%%/template/tag.tmpl
+%%WWWDIR%%/template/thread.tmpl