diff --git a/Programming/Python/build b/Programming/Python/build
index bace901..6940835 100755
--- a/Programming/Python/build
+++ b/Programming/Python/build
@@ -1,19 +1,5 @@
 #!/usr/bin/env modbuild
 
-pbuild::set_download_url "https://www.python.org/ftp/python/${V_PKG}/$P-${V_PKG}.tgz"
-
-pbuild::set_sha256sum 'Python-3.7.3.tgz:d62e3015f2f89c970ac52343976b406694931742fbde2fed8d1ce8ebb4e1f8ff'
-pbuild::set_sha256sum 'Python-2.7.12.tgz:3cb522d17463dfa69a155ab18cffa399b358c966c0363d6c8b5b3bf1384da4b6'
-pbuild::set_sha256sum 'Python-2.7.14.tgz:304c9b202ea6fbd0a4a8e0ad3733715fbd4749f2204a9173a58ec53c32ea73e8'
-pbuild::set_sha256sum 'Python-2.7.16.tgz:01da813a3600876f03f46db11cc5c408175e99f03af2ba942ef324389a83bad5'
-pbuild::set_sha256sum 'Python-3.6.3.tgz:ab6193af1921b30f587b302fe385268510e80187ca83ca82d2bfe7ab544c6f91'
-pbuild::set_sha256sum 'Python-3.7.3.tgz:d62e3015f2f89c970ac52343976b406694931742fbde2fed8d1ce8ebb4e1f8ff'
-pbuild::set_sha256sum 'Python-3.7.4.tgz:d63e63e14e6d29e17490abbe6f7d17afb3db182dbd801229f14e55f4157c4ba3'
-
-pbuild::add_to_group 'Programming'
-
-pbuild::compile_in_sourcetree
-
 pbuild::pre_configure() {
 	local -a cflags=()
 	local -a ldflags=()
@@ -74,7 +60,7 @@ pbuild::post_install() {
 	std::info "Building scipy\n"
 	pip${V_MAJOR} install scipy
 
-	std::info "Building matplotlub\n"
+	std::info "Building matplotlib\n"
 	pip${V_MAJOR} install matplotlib
 
 	std::info "Building ipython\n"
@@ -95,8 +81,8 @@ pbuild::post_install() {
 	std::info "Building virtualenv\n"
 	pip${V_MAJOR} install virtualenv
 
-	std::info "Building virtualenv\n"
-	pip${V_MAJOR} install ansible ansible-core==2.15.4
+	#std::info "Building ansible\n"
+	#pip${V_MAJOR} install ansible ansible-core==2.15.4
 }
 
 
diff --git a/Programming/Python/build-xml b/Programming/Python/build-legacy
similarity index 68%
rename from Programming/Python/build-xml
rename to Programming/Python/build-legacy
index fcd556e..bace901 100755
--- a/Programming/Python/build-xml
+++ b/Programming/Python/build-legacy
@@ -1,5 +1,19 @@
 #!/usr/bin/env modbuild
 
+pbuild::set_download_url "https://www.python.org/ftp/python/${V_PKG}/$P-${V_PKG}.tgz"
+
+pbuild::set_sha256sum 'Python-3.7.3.tgz:d62e3015f2f89c970ac52343976b406694931742fbde2fed8d1ce8ebb4e1f8ff'
+pbuild::set_sha256sum 'Python-2.7.12.tgz:3cb522d17463dfa69a155ab18cffa399b358c966c0363d6c8b5b3bf1384da4b6'
+pbuild::set_sha256sum 'Python-2.7.14.tgz:304c9b202ea6fbd0a4a8e0ad3733715fbd4749f2204a9173a58ec53c32ea73e8'
+pbuild::set_sha256sum 'Python-2.7.16.tgz:01da813a3600876f03f46db11cc5c408175e99f03af2ba942ef324389a83bad5'
+pbuild::set_sha256sum 'Python-3.6.3.tgz:ab6193af1921b30f587b302fe385268510e80187ca83ca82d2bfe7ab544c6f91'
+pbuild::set_sha256sum 'Python-3.7.3.tgz:d62e3015f2f89c970ac52343976b406694931742fbde2fed8d1ce8ebb4e1f8ff'
+pbuild::set_sha256sum 'Python-3.7.4.tgz:d63e63e14e6d29e17490abbe6f7d17afb3db182dbd801229f14e55f4157c4ba3'
+
+pbuild::add_to_group 'Programming'
+
+pbuild::compile_in_sourcetree
+
 pbuild::pre_configure() {
 	local -a cflags=()
 	local -a ldflags=()
@@ -60,7 +74,7 @@ pbuild::post_install() {
 	std::info "Building scipy\n"
 	pip${V_MAJOR} install scipy
 
-	std::info "Building matplotlib\n"
+	std::info "Building matplotlub\n"
 	pip${V_MAJOR} install matplotlib
 
 	std::info "Building ipython\n"
@@ -78,11 +92,11 @@ pbuild::post_install() {
 	std::info "Building pandas\n"
 	pip${V_MAJOR} install pandas
 
-	#std::info "Building virtualenv\n"
-	#pip${V_MAJOR} install virtualenv
+	std::info "Building virtualenv\n"
+	pip${V_MAJOR} install virtualenv
 
-	#std::info "Building ansible\n"
-	#pip${V_MAJOR} install ansible ansible-core==2.15.4
+	std::info "Building virtualenv\n"
+	pip${V_MAJOR} install ansible ansible-core==2.15.4
 }
 
 
diff --git a/Programming/Python/files/config.yaml b/Programming/Python/files/config.yaml
index 4041769..eba845b 100644
--- a/Programming/Python/files/config.yaml
+++ b/Programming/Python/files/config.yaml
@@ -25,14 +25,14 @@ Python:
     Python-3.9.17.tgz: 8ead58f669f7e19d777c3556b62fae29a81d7f06a7122ff9bc57f7dd82d7e014
     Python-3.9.18.tgz: 504ce8cfd59addc04c22f590377c6be454ae7406cb1ebf6f5a350149225a9354
   versions:
-    3.9.18-1:
+    3.13.2:
       config:
         relstage: unstable
-        build_requires: [openssl/1.1.1w, TclTk/8.6.9, xz/5.2.4]
-    3.9.18:
+        build_requires: [openssl/3.4.1, TclTk/8.6.16, xz/5.8.0]
+    3.9.18;3.9.21;3.10.16;3.11.11;3.12.9:
       config:
         relstage: unstable
-        build_requires: [openssl/1.1.1w, TclTk/8.6.9, xz/5.2.4]
+        runtime_deps: [openssl/3.4.1, TclTk/8.6.16, xz/5.8.0]
     3.9.17:
       config:
         relstage: unstable
diff --git a/Programming/TclTk/build b/Programming/TclTk/build
index d7fb54a..4b8359e 100755
--- a/Programming/TclTk/build
+++ b/Programming/TclTk/build
@@ -1,4 +1,32 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-./build_Tcl "$@" ||exit $?
-./build_Tk  -f "$@"
+#pbuild::install_docfiles 'license.terms' 'README'
+
+pbuild::configure_Darwin() {
+	export CXX=/usr/bin/clang++
+	export CC=/usr/bin/clang
+	PATH+=":/opt/X11/bin"
+	export PKG_CONFIG_PATH="/opt/X11/share/pkgconfig:/opt/X11/lib/pkgconfig:$PKG_CONFIG_PATH"
+	"${SRC_DIR}/macosx/configure" \
+		--prefix="${PREFIX}" \
+		--enable-threads \
+		--disable-symbols \
+		|| exit 1
+}
+
+pbuild::configure() {
+	"${SRC_DIR}/unix/configure" \
+		--prefix="${PREFIX}" \
+		|| exit 1
+}
+
+pbuild::post_install() {
+	{ cd "${PREFIX}"/bin && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; };
+}
+
+pbuild::post_install_Darwin() {
+	local -r libtcl="libtcl${V_MAJOR}.${V_MINOR}.dylib"
+	install_name_tool \
+			-id @executable_path/../lib/${libtcl} \
+			"${PREFIX}/lib/${libtcl}"
+}
diff --git a/Programming/TclTk/build_Tk b/Programming/TclTk/build-Tk
similarity index 73%
rename from Programming/TclTk/build_Tk
rename to Programming/TclTk/build-Tk
index d85ff18..5d3d1c0 100755
--- a/Programming/TclTk/build_Tk
+++ b/Programming/TclTk/build-Tk
@@ -1,14 +1,20 @@
 #!/usr/bin/env modbuild
 
-pbuild::set_download_url "ftp://ftp.tcl.tk/pub/tcl/tk${V_MAJOR}_${V_MINOR}/tk${V_PKG}-src.tar.gz"
-
-pbuild::add_to_group 'Programming'
-
 export PATH="${PREFIX}/bin:$PATH"
-export C_INCLUDE_PATH="${PREFIX}/include:${C_INCLUDE_PATH}"
-export LIBRARY_PATH="${PREFIX}/lib:${LIBRARY_PATH}"
+if [[ -v C_INCLUDE_PATH ]]; then
+	C_INCLUDE_PATH="${PREFIX}/include:${C_INCLUDE_PATH}"
+else
+	C_INCLUDE_PATH="${PREFIX}/include"
+fi
+export C_INCLUDE_PATH
+if [[ -v LIBRARY_PATH ]]; then
+	LIBRARY_PATH="${PREFIX}/lib:${LIBRARY_PATH}"
+else
+	LIBRARY_PATH="${PREFIX}/lib"
+fi
+export LIBRARY_PATH
 
-pbuild::configure_Darwin() {
+pbuil:d:configure_Darwin() {
 	PATH+=":/opt/X11/bin"
 	export CXX=/usr/bin/clang++
 	export CC=/usr/bin/clang
@@ -24,7 +30,7 @@ pbuild::configure_Darwin() {
 		|| exit 1
 }
 
-pbuild::configure_Linux() {
+pbuild::configure() {
 	"${SRC_DIR}/unix/configure" \
 		--prefix="${PREFIX}" \
 		--with-tcl="${PREFIX}/lib" \
diff --git a/Programming/TclTk/build_Tcl b/Programming/TclTk/build_Tcl
deleted file mode 100755
index e2a8eda..0000000
--- a/Programming/TclTk/build_Tcl
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env modbuild
-
-pbuild::set_download_url "ftp://ftp.tcl.tk/pub/tcl/tcl8_6/tcl${V_PKG}-src.tar.gz"
-
-pbuild::add_to_group 'Programming'
-pbuild::install_docfiles 'license.terms' 'README'
-
-pbuild::configure_Darwin() {
-	export CXX=/usr/bin/clang++
-	export CC=/usr/bin/clang
-	PATH+=":/opt/X11/bin"
-	export PKG_CONFIG_PATH="/opt/X11/share/pkgconfig:/opt/X11/lib/pkgconfig:$PKG_CONFIG_PATH"
-	"${SRC_DIR}/macosx/configure" \
-		--prefix="${PREFIX}" \
-		--enable-threads \
-		--disable-symbols \
-		|| exit 1
-}
-
-pbuild::configure_Linux() {
-	"${SRC_DIR}/unix/configure" \
-		--prefix="${PREFIX}" \
-		|| exit 1
-}
-
-pbuild::post_install() {
-	{ cd "${PREFIX}"/bin && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; };
-}
-
-pbuild::post_install_Darwin() {
-	local -r libtcl="libtcl${V_MAJOR}.${V_MINOR}.dylib"
-	install_name_tool \
-			-id @executable_path/../lib/${libtcl} \
-			"${PREFIX}/lib/${libtcl}"
-}
diff --git a/Programming/TclTk/files/config.yaml b/Programming/TclTk/files/config.yaml
new file mode 100644
index 0000000..5d192cb
--- /dev/null
+++ b/Programming/TclTk/files/config.yaml
@@ -0,0 +1,32 @@
+format: 1
+TclTk:
+  defaults:
+    group: Programming
+    overlay: base
+    relstage: stable
+    urls:
+      - url: http://prdownloads.sourceforge.net/tcl/tcl${V_PKG}-src.tar.gz
+  shasums:
+  versions:
+    8.6.16:
+      config:
+        sub_packages:
+          - name: Tk
+            version: 8.6.16
+            build_args:
+    8.6.9:
+      config:
+        sub_packages:
+          - name: Tk
+            version: 8.6.9
+            build_args:
+
+Tk:
+  type: sub_package
+  defaults:
+    urls:
+      - url: http://prdownloads.sourceforge.net/tcl/tk${V_PKG}-src.tar.gz 
+  versions:
+    8.6.16:
+    8.6.9:
+
diff --git a/Programming/TclTk/files/variants.macos10.14 b/Programming/TclTk/files/variants.macos10.14
deleted file mode 100644
index a4f9b5b..0000000
--- a/Programming/TclTk/files/variants.macos10.14
+++ /dev/null
@@ -1 +0,0 @@
-TclTk/8.6.9	stable
diff --git a/Programming/TclTk/files/variants.rhel6 b/Programming/TclTk/files/variants.rhel6
deleted file mode 100644
index a4f9b5b..0000000
--- a/Programming/TclTk/files/variants.rhel6
+++ /dev/null
@@ -1 +0,0 @@
-TclTk/8.6.9	stable
diff --git a/Programming/perl/build b/Programming/perl/build
index 8a481af..140372a 100755
--- a/Programming/perl/build
+++ b/Programming/perl/build
@@ -1,10 +1,5 @@
 #!/usr/bin/env modbuild
 
-pbuild::set_download_url "http://www.cpan.org/src/5.0/$P-$V.tar.gz"
-
-pbuild::compile_in_sourcetree
-pbuild::add_to_group 'Programming'
-
 pbuild::configure() {
 	"${SRC_DIR}"/configure.gnu \
 		--prefix="${PREFIX}" \
diff --git a/Programming/perl/files/config.yaml b/Programming/perl/files/config.yaml
new file mode 100644
index 0000000..606fa5f
--- /dev/null
+++ b/Programming/perl/files/config.yaml
@@ -0,0 +1,13 @@
+format: 1
+perl:
+  defaults:
+    group: Programming
+    overlay: base
+    relstage: stable
+    compile_in_sourcetree: true
+    urls:
+      - url: http://www.cpan.org/src/5.0/$P-$V.tar.gz
+
+  shasums:
+  versions:
+    5.30.0;5.40.0;5.40.1:
diff --git a/Tools/openssl/build b/Tools/openssl/build
index 3d64adb..3f0ea3f 100755
--- a/Tools/openssl/build
+++ b/Tools/openssl/build
@@ -1,24 +1,13 @@
 #!/usr/bin/env modbuild
 
-pbuild::set_download_url "https://www.openssl.org/source/$P-$V.tar.gz"
-
 # use system gcc to compile
-declare -rx CC=gcc
+#declare -rx CC=gcc
 
-pbuild::add_to_group 'Tools'
-pbuild::compile_in_sourcetree
-
-pbuild::pre_configure_Darwin() {
-	pbuild::add_configure_args 'darwin64-x86_64-cc'
-}
-
-pbuild::pre_configure_Linux() {
-	pbuild::add_configure_args 'linux-x86_64'
-}
-
-pbuild::configure() {
+pbuild::configure(){
 	export CFLAGS='-fPIC'
-	"${SRC_DIR}"/Configure shared --prefix="${PREFIX}" "${CONFIGURE_ARGS[@]}" \
+	local -r os=$(uname -s)
+	local -r machine=$(uname -m)
+	"${SRC_DIR}"/Configure shared --prefix="${PREFIX}" "${os,,}-${machine}" \
 		|| exit 1
 }
 
diff --git a/Tools/openssl/files/config.yaml b/Tools/openssl/files/config.yaml
new file mode 100644
index 0000000..d85cbe4
--- /dev/null
+++ b/Tools/openssl/files/config.yaml
@@ -0,0 +1,43 @@
+---
+format: 1
+openssl:
+  defaults:
+    group: Tools
+    overlay: base
+    relstage: stable
+    compile_in_sourcetree: true
+    urls:
+      - url: https://www.openssl.org/source/$P-$V.tar.gz
+  shasums:
+  versions:
+    3.4.1:
+      config:
+        docfiles:
+          - ACKNOWLEDGEMENTS.md
+          - AUTHORS.md
+          - CHANGES.md
+          - CODE-OF-CONDUCT.md
+          - CONTRIBUTING.md
+          - HACKING.md
+          - INSTALL.md
+          - LICENSE.txt
+          - NEWS.md
+          - NOTES-ANDROID.md
+          - NOTES-ANSI.md
+          - NOTES-DJGPP.md
+          - NOTES-NONSTOP.md
+          - NOTES-PERL.md
+          - NOTES-POSIX.md
+          - NOTES-UNIX.md
+          - NOTES-VALGRIND.md
+          - NOTES-VMS.md
+          - NOTES-WINDOWS.md
+          - README-ENGINES.md
+          - README-FIPS.md
+          - README-PROVIDERS.md
+          - README-QUIC.md
+          - README.md
+          - SUPPORT.md
+        build_requires:
+          - perl/5.40.1
+
diff --git a/Tools/xz/build b/Tools/xz/build
index 6501335..145bb9e 100755
--- a/Tools/xz/build
+++ b/Tools/xz/build
@@ -1,24 +1,12 @@
 #!/usr/bin/env modbuild
 
-pbuild::add_to_group 'Tools'
-
-pbuild::set_download_url \
-        "https://sourceforge.net/projects/lzmautils/files/$P-${V_PKG}.tar.gz"
-
-pbuild::set_sha256sum 'xz-5.2.4.tar.gz:b512f3b726d3b37b6dc4c8570e137b9311e7552e8ccbab4d39d47ce5f4177145'
-pbuild::install_docfiles \
-	AUTHORS \
-	COPYING \
-	COPYING.GPLv2 \
-	COPYING.GPLv3 \
-	COPYING.LGPLv2.1 \
-	ChangeLog \
-	NEWS \
-	PACKAGERS \
-	README \
-	THANKS \
-	TODO
-
+pbuild::post_prep(){
+	# autogen.sh exits with an error if po4a
+	# is not installed. For now we ignore this.
+	# :FIXME:
+	# build a po4a module 
+	./autogen.sh || :
+}
 # Local Variables:
 # mode: sh
 # sh-basic-offset: 8
diff --git a/Tools/xz/files/config.yaml b/Tools/xz/files/config.yaml
new file mode 100644
index 0000000..9f51112
--- /dev/null
+++ b/Tools/xz/files/config.yaml
@@ -0,0 +1,28 @@
+---
+format: 1
+xz:
+  defaults:
+    group: Tools
+    overlay: base
+    relstage: stable
+    docfiles:
+      - AUTHORS
+      - COPYING
+      - COPYING.GPLv2
+      - COPYING.GPLv3
+      - COPYING.LGPLv2.1
+      - ChangeLog
+      - NEWS
+      - PACKAGERS
+      - README
+      - THANKS
+      - TODO
+    urls:
+      - url: https://sourceforge.net/projects/lzmautils/files/$P-${V_PKG}.tar.gz
+  shasums:
+  versions:
+    5.8.0:
+      config:
+        relstage: unstable
+
+