diff --git a/media-gfx/tuxpaint-config/tuxpaint_config-0.0.22~rc1.recipe b/media-gfx/tuxpaint-config/tuxpaint_config-0.0.22.recipe
similarity index 92%
rename from media-gfx/tuxpaint-config/tuxpaint_config-0.0.22~rc1.recipe
rename to media-gfx/tuxpaint-config/tuxpaint_config-0.0.22.recipe
index 0f5833f70..24f52ca3e 100644
--- a/media-gfx/tuxpaint-config/tuxpaint_config-0.0.22~rc1.recipe
+++ b/media-gfx/tuxpaint-config/tuxpaint_config-0.0.22.recipe
@@ -8,9 +8,9 @@ HOMEPAGE="http://www.tuxpaint.org/"
 COPYRIGHT="2002-2023 Bill Kendrick and others"
 LICENSE="GNU GPL v2"
 REVISION="1"
-SOURCE_URI="https://sourceforge.net/projects/tuxpaint/files/tuxpaint-config/${portVersion/\~rc1/-beta}/tuxpaint-config-${portVersion/\~/-}.tar.gz"
-CHECKSUM_SHA256="8c63eb04ceb6f3e152864b0c836c810edbc2aa6fb38bc8d21ee064aa9c6d8029"
-SOURCE_DIR="tuxpaint-config-${portVersion/\~/-}"
+SOURCE_URI="https://sourceforge.net/projects/tuxpaint/files/tuxpaint-config/$portVersion/tuxpaint-config-$portVersion.tar.gz"
+CHECKSUM_SHA256="89953ce499fdc1ffa6bbf8514584420b4c843f8861e1c97df84c326e49f701d7"
+SOURCE_DIR="tuxpaint-config-$portVersion"
 ADDITIONAL_FILES="tuxpaint_config.rdef.in"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -22,15 +22,15 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libfltk$secondaryArchSuffix
 	lib:libfontconfig$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
 	lib:libglib_2.0$secondaryArchSuffix
 	lib:libgobject_2.0$secondaryArchSuffix
 	lib:libharfbuzz$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
 	lib:libpango_1.0$secondaryArchSuffix
 	lib:libpangoft2_1.0$secondaryArchSuffix
-	lib:libfltk$secondaryArchSuffix
-	lib:libintl$secondaryArchSuffix
 	lib:libpaper$secondaryArchSuffix
 	lib:libunibreak$secondaryArchSuffix
 	lib:libX11$secondaryArchSuffix
@@ -50,6 +50,7 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+
 BUILD()
 {
 	make haiku PREFIX=$prefix DATA_PREFIX=$dataDir DOC_PREFIX=$docDir \
diff --git a/media-gfx/tuxpaint-stamps/tuxpaint_stamps-2023.07.13.recipe b/media-gfx/tuxpaint-stamps/tuxpaint_stamps-2023.07.20.recipe
similarity index 84%
rename from media-gfx/tuxpaint-stamps/tuxpaint_stamps-2023.07.13.recipe
rename to media-gfx/tuxpaint-stamps/tuxpaint_stamps-2023.07.20.recipe
index 911eb26e1..1cfcee2ee 100644
--- a/media-gfx/tuxpaint-stamps/tuxpaint_stamps-2023.07.13.recipe
+++ b/media-gfx/tuxpaint-stamps/tuxpaint_stamps-2023.07.20.recipe
@@ -8,8 +8,8 @@ HOMEPAGE="http://www.tuxpaint.org/"
 COPYRIGHT="2002-2023 Bill Kendrick and others"
 LICENSE="GNU GPL v2"
 REVISION="1"
-SOURCE_URI="https://sourceforge.net/projects/tuxpaint/files/tuxpaint-stamps/2023-07-XX-beta/tuxpaint-stamps-$portVersion.tar.gz"
-CHECKSUM_SHA256="ab9a8f694c5ab8bbc38702a9c8b867b4b6a0da179e3b69a430e8690c2fcd2f1a"
+SOURCE_URI="https://sourceforge.net/projects/tuxpaint/files/tuxpaint-stamps/${portVersion//./-}/tuxpaint-stamps-$portVersion.tar.gz"
+CHECKSUM_SHA256="0fb420617451759a4ddcd8bfe255e85c2b6c24e453f93da11da2d41698037842"
 SOURCE_DIR="tuxpaint-stamps-$portVersion"
 
 ARCHITECTURES="any"
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.31~rc1.recipe b/media-gfx/tuxpaint/tuxpaint-0.9.31.recipe
similarity index 92%
rename from media-gfx/tuxpaint/tuxpaint-0.9.31~rc1.recipe
rename to media-gfx/tuxpaint/tuxpaint-0.9.31.recipe
index d68d47d6f..50e0d4102 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.31~rc1.recipe
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.31.recipe
@@ -8,9 +8,8 @@ HOMEPAGE="http://www.tuxpaint.org/"
 COPYRIGHT="2002-2023 Bill Kendrick and others"
 LICENSE="GNU GPL v2"
 REVISION="1"
-SOURCE_URI="https://sourceforge.net/projects/tuxpaint/files/tuxpaint/${portVersion/\~rc1/-beta}/tuxpaint-${portVersion/\~/-}.tar.gz"
-CHECKSUM_SHA256="eac9fcda9fae64652c68d5c514b4ee4a07417911fd6b7cb4c5ab2d3c74d29ab0"
-SOURCE_DIR="tuxpaint-${portVersion/\~/-}"
+SOURCE_URI="https://sourceforge.net/projects/tuxpaint/files/tuxpaint/$portVersion/tuxpaint-$portVersion.tar.gz"
+CHECKSUM_SHA256="1a85c04fa5c9ae6b3ffd2ca8fa86a84c0c8b462b5059fa1fc2c445b5cfa857ee"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -64,7 +63,7 @@ BUILD_REQUIRES="
 	devel:librsvg_2$secondaryArchSuffix
 	devel:libSDL2_2.0$secondaryArchSuffix
 	devel:libSDL2_image_2.0$secondaryArchSuffix
-	devel:libSDL2_gfx_1.0$secondaryArchSuffix
+	devel:libSDL2_gfx$secondaryArchSuffix
 	devel:libSDL2_mixer_2.0$secondaryArchSuffix
 	devel:libSDL2_pango$secondaryArchSuffix
 	devel:libSDL2_ttf_2.0$secondaryArchSuffix