diff --git a/www/pmwiki/Makefile b/www/pmwiki/Makefile
index 355dbee0ab49..98e32cbdb23f 100644
--- a/www/pmwiki/Makefile
+++ b/www/pmwiki/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	pmwiki
-PORTVERSION=	2.3.25
+PORTVERSION=	2.3.31
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.pmwiki.org/pub/pmwiki/
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	WikiWikiWeb clone using PHP
 WWW=		https://www.pmwiki.org
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/docs/COPYING.txt
 
 USES=		cpe tar:tgz php:web
 USE_PHP=	mbstring session
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 PORTDOCS=	*
 
 PLIST_SUB=	PMWIKIDIR=${PMWIKIDIR} WWWGRP=${WWWGRP} WWWOWN=${WWWOWN}
 SUB_LIST+=	PMWIKIDIR=${PMWIKIDIR}
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 
 pre-fetch:
 .if !defined(PMWIKIDIR)
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Define PMWIKIDIR (now: ${PMWIKIDIR})"
 	@${ECHO_MSG} "to override default: www/pmwiki".
 	@${ECHO_MSG} ""
 .endif
 
 PMWIKIDIR?=	www/pmwiki
 
 CPIOFLAGS=	--quiet -pdm -R ${WWWOWN}:${WWWGRP}
 
 post-extract:
 	@${MV} ${WRKSRC}/README.txt ${WRKSRC}/docs
 	@${MV} ${WRKSRC}/docs/sample-config.php ${WRKSRC}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PMWIKIDIR}
 	@cd ${WRKSRC} && ${FIND} . ! \( -name docs -prune \) | \
 		${CPIO} ${CPIOFLAGS} ${STAGEDIR}${PREFIX}/${PMWIKIDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PMWIKIDIR}/wiki.d
 
 .include <bsd.port.mk>
diff --git a/www/pmwiki/distinfo b/www/pmwiki/distinfo
index 52ebdffb4ef4..7a7d76d6a89d 100644
--- a/www/pmwiki/distinfo
+++ b/www/pmwiki/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1691397014
-SHA256 (pmwiki-2.3.25.tgz) = d63bcea15a73b3dbabe95dd507e9e4fce4a91d067a977491a501db08870bb117
-SIZE (pmwiki-2.3.25.tgz) = 536279
+TIMESTAMP = 1710583992
+SHA256 (pmwiki-2.3.31.tgz) = 56479abb5ca5bee9e50e2801357b0a1a5eff24df4891063f7a8c1170e29ca346
+SIZE (pmwiki-2.3.31.tgz) = 533595
diff --git a/www/pmwiki/pkg-plist b/www/pmwiki/pkg-plist
index 2c63c0dc70de..e84b8dc0cbe1 100644
--- a/www/pmwiki/pkg-plist
+++ b/www/pmwiki/pkg-plist
@@ -1,230 +1,232 @@
 @dir(%%WWWOWN%%,%%WWWGRP%%,775) %%PMWIKIDIR%%/wiki.d
 @dir(%%WWWOWN%%,%%WWWGRP%%) %%PMWIKIDIR%%
 @dir %%PMWIKIDIR%%/pub/css
 %%PMWIKIDIR%%/wikilib.d/SiteAdmin.Status
 %%PMWIKIDIR%%/wikilib.d/SiteAdmin.SiteAdmin
 %%PMWIKIDIR%%/wikilib.d/SiteAdmin.GroupAttributes
 %%PMWIKIDIR%%/wikilib.d/SiteAdmin.AuthUser
 %%PMWIKIDIR%%/wikilib.d/SiteAdmin.AuthList
 %%PMWIKIDIR%%/wikilib.d/Site.UploadQuickReference
 %%PMWIKIDIR%%/wikilib.d/Site.Site
 %%PMWIKIDIR%%/wikilib.d/Site.SideBar
 %%PMWIKIDIR%%/wikilib.d/Site.Search
 %%PMWIKIDIR%%/wikilib.d/Site.Preferences
 %%PMWIKIDIR%%/wikilib.d/Site.PmFormTemplates
 %%PMWIKIDIR%%/wikilib.d/Site.PageNotFound
 %%PMWIKIDIR%%/wikilib.d/Site.PageListTemplates
 %%PMWIKIDIR%%/wikilib.d/Site.PageActions
 %%PMWIKIDIR%%/wikilib.d/Site.GroupAttributes
 %%PMWIKIDIR%%/wikilib.d/Site.EditQuickReference
 %%PMWIKIDIR%%/wikilib.d/Site.EditForm
 %%PMWIKIDIR%%/wikilib.d/Site.AuthUser
 %%PMWIKIDIR%%/wikilib.d/Site.AuthForm
 %%PMWIKIDIR%%/wikilib.d/PmWiki.WikiWords
 %%PMWIKIDIR%%/wikilib.d/PmWiki.WikiWord
 %%PMWIKIDIR%%/wikilib.d/PmWiki.WikiWikiWeb
 %%PMWIKIDIR%%/wikilib.d/PmWiki.WikiTrails
 %%PMWIKIDIR%%/wikilib.d/PmWiki.WikiStyles
 %%PMWIKIDIR%%/wikilib.d/PmWiki.WikiStyleExamples
 %%PMWIKIDIR%%/wikilib.d/PmWiki.WikiStructure
 %%PMWIKIDIR%%/wikilib.d/PmWiki.WikiSandbox
 %%PMWIKIDIR%%/wikilib.d/PmWiki.WikiPage
 %%PMWIKIDIR%%/wikilib.d/PmWiki.WikiGroups
 %%PMWIKIDIR%%/wikilib.d/PmWiki.WikiGroup
 %%PMWIKIDIR%%/wikilib.d/PmWiki.WikiFarms
 %%PMWIKIDIR%%/wikilib.d/PmWiki.WikiFarmTerminology
 %%PMWIKIDIR%%/wikilib.d/PmWiki.WikiAdministrator
 %%PMWIKIDIR%%/wikilib.d/PmWiki.WebFeeds
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Version
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Variables
 %%PMWIKIDIR%%/wikilib.d/PmWiki.UrlApprovals
 %%PMWIKIDIR%%/wikilib.d/PmWiki.UploadsAdmin
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Uploads
 %%PMWIKIDIR%%/wikilib.d/PmWiki.UploadVariables
 %%PMWIKIDIR%%/wikilib.d/PmWiki.UpgradingFromPmWiki1
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Upgrades
 %%PMWIKIDIR%%/wikilib.d/PmWiki.UTF-8
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Troubleshooting
 %%PMWIKIDIR%%/wikilib.d/PmWiki.TextFormattingRules
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Tables
 %%PMWIKIDIR%%/wikilib.d/PmWiki.TableOfContents
 %%PMWIKIDIR%%/wikilib.d/PmWiki.TableDirectives
 %%PMWIKIDIR%%/wikilib.d/PmWiki.SpecialCharacters
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Skins
 %%PMWIKIDIR%%/wikilib.d/PmWiki.SkinTemplates
 %%PMWIKIDIR%%/wikilib.d/PmWiki.SitePreferences
 %%PMWIKIDIR%%/wikilib.d/PmWiki.SitePageActions
 %%PMWIKIDIR%%/wikilib.d/PmWiki.SimultaneousEdits
 %%PMWIKIDIR%%/wikilib.d/PmWiki.SecurityVariables
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Security
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Search
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Requirements
 %%PMWIKIDIR%%/wikilib.d/PmWiki.ReleaseNotes
 %%PMWIKIDIR%%/wikilib.d/PmWiki.RefCount
 %%PMWIKIDIR%%/wikilib.d/PmWiki.PmWikiPhilosophy
 %%PMWIKIDIR%%/wikilib.d/PmWiki.PmWiki
 %%PMWIKIDIR%%/wikilib.d/PmWiki.PerGroupCustomizations
 %%PMWIKIDIR%%/wikilib.d/PmWiki.PatrickMichaud
 %%PMWIKIDIR%%/wikilib.d/PmWiki.PathVariables
 %%PMWIKIDIR%%/wikilib.d/PmWiki.PasswordsAdmin
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Passwords
 %%PMWIKIDIR%%/wikilib.d/PmWiki.PagelistVariables
 %%PMWIKIDIR%%/wikilib.d/PmWiki.PageVariables
 %%PMWIKIDIR%%/wikilib.d/PmWiki.PageTextVariables
 %%PMWIKIDIR%%/wikilib.d/PmWiki.PageLists
 %%PMWIKIDIR%%/wikilib.d/PmWiki.PageListTemplates
 %%PMWIKIDIR%%/wikilib.d/PmWiki.PageHistory
 %%PMWIKIDIR%%/wikilib.d/PmWiki.PageFileFormat
 %%PMWIKIDIR%%/wikilib.d/PmWiki.PageDirectives
 %%PMWIKIDIR%%/wikilib.d/PmWiki.OtherVariables
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Notify
 %%PMWIKIDIR%%/wikilib.d/PmWiki.MarkupMasterIndex
 %%PMWIKIDIR%%/wikilib.d/PmWiki.MarkupExpressions
 %%PMWIKIDIR%%/wikilib.d/PmWiki.MailingLists
 %%PMWIKIDIR%%/wikilib.d/PmWiki.LocalCustomizations
 %%PMWIKIDIR%%/wikilib.d/PmWiki.ListStyles
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Links
 %%PMWIKIDIR%%/wikilib.d/PmWiki.LinkVariables
 %%PMWIKIDIR%%/wikilib.d/PmWiki.LayoutVariables
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Introduction
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Internationalizations
 %%PMWIKIDIR%%/wikilib.d/PmWiki.InterMap
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Installation
 %%PMWIKIDIR%%/wikilib.d/PmWiki.InitialSetupTasks
 %%PMWIKIDIR%%/wikilib.d/PmWiki.IncludeOtherPages
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Images
 %%PMWIKIDIR%%/wikilib.d/PmWiki.I18nVariables
 %%PMWIKIDIR%%/wikilib.d/PmWiki.GroupHeaders
 %%PMWIKIDIR%%/wikilib.d/PmWiki.GroupHeader
 %%PMWIKIDIR%%/wikilib.d/PmWiki.GroupFooter
 %%PMWIKIDIR%%/wikilib.d/PmWiki.GroupCustomizations
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Glossary
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Functions
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Forms
 %%PMWIKIDIR%%/wikilib.d/PmWiki.FmtPageName
 %%PMWIKIDIR%%/wikilib.d/PmWiki.FilePermissions
 %%PMWIKIDIR%%/wikilib.d/PmWiki.FAQ
 %%PMWIKIDIR%%/wikilib.d/PmWiki.EditVariables
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Drafts
 %%PMWIKIDIR%%/wikilib.d/PmWiki.DocumentationIndex
 %%PMWIKIDIR%%/wikilib.d/PmWiki.DesignNotes
 %%PMWIKIDIR%%/wikilib.d/PmWiki.DeletingPages
 %%PMWIKIDIR%%/wikilib.d/PmWiki.DebugVariables
 %%PMWIKIDIR%%/wikilib.d/PmWiki.CustomWikiStyles
 %%PMWIKIDIR%%/wikilib.d/PmWiki.CustomMarkup
 %%PMWIKIDIR%%/wikilib.d/PmWiki.CustomInterMap
 %%PMWIKIDIR%%/wikilib.d/PmWiki.CreatingNewPages
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Contributors
 %%PMWIKIDIR%%/wikilib.d/PmWiki.ContactUs
 %%PMWIKIDIR%%/wikilib.d/PmWiki.ConditionalMarkup
 %%PMWIKIDIR%%/wikilib.d/PmWiki.ChangeLog
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Categories
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Blocklist
 %%PMWIKIDIR%%/wikilib.d/PmWiki.BlockMarkup
 %%PMWIKIDIR%%/wikilib.d/PmWiki.BasicVariables
 %%PMWIKIDIR%%/wikilib.d/PmWiki.BasicEditing
 %%PMWIKIDIR%%/wikilib.d/PmWiki.BackupAndRestore
 %%PMWIKIDIR%%/wikilib.d/PmWiki.AvailableActions
 %%PMWIKIDIR%%/wikilib.d/PmWiki.AuthUser
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Audiences
 %%PMWIKIDIR%%/wikilib.d/PmWiki.AccessKeys
 %%PMWIKIDIR%%/wikilib.d/Main.WikiSandbox
 %%PMWIKIDIR%%/wikilib.d/Main.HomePage
 %%PMWIKIDIR%%/wikilib.d/Category.GroupFooter
 %%PMWIKIDIR%%/scripts/xlpage-utf-8.php
 %%PMWIKIDIR%%/scripts/xlpage-iso-8859-9.php
 %%PMWIKIDIR%%/scripts/xlpage-iso-8859-2.php
 %%PMWIKIDIR%%/scripts/xlpage-iso-8859-13.php
 %%PMWIKIDIR%%/scripts/wikiwords.php
 %%PMWIKIDIR%%/scripts/wikistyles.php
 %%PMWIKIDIR%%/scripts/version.php
 %%PMWIKIDIR%%/scripts/vardoc.php
 %%PMWIKIDIR%%/scripts/utils.php
 %%PMWIKIDIR%%/scripts/urlapprove.php
 %%PMWIKIDIR%%/scripts/upload.php
 %%PMWIKIDIR%%/scripts/upgrades.php
 %%PMWIKIDIR%%/scripts/transition.php
 %%PMWIKIDIR%%/scripts/trails.php
 %%PMWIKIDIR%%/scripts/stdmarkup.php
 %%PMWIKIDIR%%/scripts/stdconfig.php
 %%PMWIKIDIR%%/scripts/skins.php
 %%PMWIKIDIR%%/scripts/simuledit.php
 %%PMWIKIDIR%%/scripts/robots.php
 %%PMWIKIDIR%%/scripts/refcount.php
 %%PMWIKIDIR%%/scripts/prefs.php
 %%PMWIKIDIR%%/scripts/pmform.php
 %%PMWIKIDIR%%/scripts/phpdiff.php
 %%PMWIKIDIR%%/scripts/pgcust.php
 %%PMWIKIDIR%%/scripts/pagerev.php
 %%PMWIKIDIR%%/scripts/pagelist.php
 %%PMWIKIDIR%%/scripts/notify.php
 %%PMWIKIDIR%%/scripts/markupexpr.php
 %%PMWIKIDIR%%/scripts/intermap.txt
 %%PMWIKIDIR%%/scripts/httpauth.php
 %%PMWIKIDIR%%/scripts/guiedit.php
 %%PMWIKIDIR%%/scripts/forms.php
 %%PMWIKIDIR%%/scripts/feeds.php
 %%PMWIKIDIR%%/scripts/draft.php
 %%PMWIKIDIR%%/scripts/diag.php
 %%PMWIKIDIR%%/scripts/crypt.php
 %%PMWIKIDIR%%/scripts/creole.php
 %%PMWIKIDIR%%/scripts/caches.php
 %%PMWIKIDIR%%/scripts/blocklist.php
 %%PMWIKIDIR%%/scripts/authuser.php
 %%PMWIKIDIR%%/scripts/author.php
 %%PMWIKIDIR%%/scripts/.htaccess
 %%PMWIKIDIR%%/sample-config.php
 %%PMWIKIDIR%%/pub/skins/print/print.tmpl
 %%PMWIKIDIR%%/pub/skins/print/print.php
 %%PMWIKIDIR%%/pub/skins/print/print.css
 %%PMWIKIDIR%%/pub/skins/print/README
 %%PMWIKIDIR%%/pub/skins/pmwiki/pmwiki.tmpl
 %%PMWIKIDIR%%/pub/skins/pmwiki/pmwiki.css
 %%PMWIKIDIR%%/pub/skins/pmwiki/pmwiki-32.gif
+%%PMWIKIDIR%%/pub/skins/pmwiki/pmwiki-32.svg
 %%PMWIKIDIR%%/pub/skins/pmwiki/README
 %%PMWIKIDIR%%/pub/skins/pmwiki-responsive/xwrench.svg
 %%PMWIKIDIR%%/pub/skins/pmwiki-responsive/xsearch.svg
 %%PMWIKIDIR%%/pub/skins/pmwiki-responsive/xmenu.svg
 %%PMWIKIDIR%%/pub/skins/pmwiki-responsive/xclose.svg
 %%PMWIKIDIR%%/pub/skins/pmwiki-responsive/skin.tmpl
 %%PMWIKIDIR%%/pub/skins/pmwiki-responsive/skin.php
 %%PMWIKIDIR%%/pub/skins/pmwiki-responsive/skin.js
 %%PMWIKIDIR%%/pub/skins/pmwiki-responsive/skin.css
 %%PMWIKIDIR%%/pub/skins/pmwiki-responsive/README
+%%PMWIKIDIR%%/pub/pmwiki-darktoggle.js
 %%PMWIKIDIR%%/pub/pmwiki-utils.js
 %%PMWIKIDIR%%/pub/guiedit/underline.gif
 %%PMWIKIDIR%%/pub/guiedit/ul.gif
 %%PMWIKIDIR%%/pub/guiedit/table.gif
 %%PMWIKIDIR%%/pub/guiedit/sup.gif
 %%PMWIKIDIR%%/pub/guiedit/sub.gif
 %%PMWIKIDIR%%/pub/guiedit/strong.gif
 %%PMWIKIDIR%%/pub/guiedit/spellcheck.gif
 %%PMWIKIDIR%%/pub/guiedit/small.gif
 %%PMWIKIDIR%%/pub/guiedit/save.gif
 %%PMWIKIDIR%%/pub/guiedit/right.gif
 %%PMWIKIDIR%%/pub/guiedit/preview.gif
 %%PMWIKIDIR%%/pub/guiedit/pmwiki.syntax.js
 %%PMWIKIDIR%%/pub/guiedit/pmwiki.syntax.css
 %%PMWIKIDIR%%/pub/guiedit/pagelink.gif
 %%PMWIKIDIR%%/pub/guiedit/outdent.gif
 %%PMWIKIDIR%%/pub/guiedit/ol.gif
 %%PMWIKIDIR%%/pub/guiedit/math.gif
 %%PMWIKIDIR%%/pub/guiedit/left.gif
 %%PMWIKIDIR%%/pub/guiedit/indent.gif
 %%PMWIKIDIR%%/pub/guiedit/hr.gif
 %%PMWIKIDIR%%/pub/guiedit/h3.gif
 %%PMWIKIDIR%%/pub/guiedit/h2.gif
 %%PMWIKIDIR%%/pub/guiedit/h1.gif
 %%PMWIKIDIR%%/pub/guiedit/h.gif
 %%PMWIKIDIR%%/pub/guiedit/guiedit.js
 %%PMWIKIDIR%%/pub/guiedit/fixurl.png
 %%PMWIKIDIR%%/pub/guiedit/extlink.gif
 %%PMWIKIDIR%%/pub/guiedit/em.gif
 %%PMWIKIDIR%%/pub/guiedit/center.gif
 %%PMWIKIDIR%%/pub/guiedit/blank.gif
 %%PMWIKIDIR%%/pub/guiedit/big.gif
 %%PMWIKIDIR%%/pub/guiedit/attach.gif
 %%PMWIKIDIR%%/pub/guiedit/README
 %%PMWIKIDIR%%/pmwiki.php
 %%PMWIKIDIR%%/local/.htaccess
 %%PMWIKIDIR%%/cookbook/.htaccess