diff --git a/x11-themes/kde-icons-black-and-white/Makefile b/x11-themes/kde-icons-black-and-white/Makefile
index 56027d11e326..9a1a7557389c 100644
--- a/x11-themes/kde-icons-black-and-white/Makefile
+++ b/x11-themes/kde-icons-black-and-white/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	black-and-white
 PORTVERSION=	2.0.a
-MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/${DIST_SUBDIR}/
-DISTNAME=	black%20and%20white
+MASTER_SITES=	https://BSDforge.com/projects/source/x11-themes/kde-icons-black-and-white/
+DISTNAME=	black-and-white
 
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	KDE Black And White iconset
 WWW=		http://www.kde-look.org/content/show.php?content=24645
 
 LICENSE=	theme
 LICENSE_NAME=	theme
 LICENSE_TEXT=	may contain iconic, visual, graphical or other\
 		elements that may not be distributed without the\
 		consent of either the trademark or the patent holder
 LICENSE_PERMS=	auto-accept
 
 WRKSRC=		${WRKDIR}/"black and white"
 
 .include "${.CURDIR}/../kde-icons-noia/Makefile.icons"
diff --git a/x11-themes/kde-icons-black-and-white/distinfo b/x11-themes/kde-icons-black-and-white/distinfo
index 0fdb0d52afcc..34cd99dc222c 100644
--- a/x11-themes/kde-icons-black-and-white/distinfo
+++ b/x11-themes/kde-icons-black-and-white/distinfo
@@ -1,2 +1,3 @@
-SHA256 (KDE/black%20and%20white.tar.gz) = 206d8710c50391314cbe3eec695930b7100ba41ac9997572a87fcbd6f4980493
-SIZE (KDE/black%20and%20white.tar.gz) = 6703176
+TIMESTAMP = 1671207590
+SHA256 (KDE/black-and-white.tar.gz) = 206d8710c50391314cbe3eec695930b7100ba41ac9997572a87fcbd6f4980493
+SIZE (KDE/black-and-white.tar.gz) = 6703176
diff --git a/x11-themes/kde-icons-black-and-white/pkg-message b/x11-themes/kde-icons-black-and-white/pkg-message
index 8e20c69ede3d..2b99d23a5b84 100644
--- a/x11-themes/kde-icons-black-and-white/pkg-message
+++ b/x11-themes/kde-icons-black-and-white/pkg-message
@@ -1,13 +1,13 @@
 [
 { type: install
   message: <<EOM
 How to install a new icon theme
 
-1) Open the KDE-Menu and start the Control Center
-2) Click on "Look and Feel", then "Icons"
+1) Open the KDE-Menu and start the System Settings
+2) Click on "Appearance", then "Icons"
 3) Select black and white iconset
 4) Click "Apply"
 5) Have fun! :-)
 EOM
 }
 ]