diff --git a/py-packages/Makefile b/py-packages/Makefile
index 5dfa7bf..606263a 100644
--- a/py-packages/Makefile
+++ b/py-packages/Makefile
@@ -16,6 +16,7 @@ help: ## *:･ﾟ✧*:･ﾟ✧ This help *:･ﾟ✧*:･ﾟ✧
 clean: ## Clean build and .egg folder in py modules
 	find . -depth -type d -name __pycache__ -exec rm -vr \{\} \;
 	find . -depth -type d -name build -exec rm -vr \{\} \;
+	find . -depth -type d -name dist -exec rm -vr \{\} \;
 	find . -depth -type d -name '*.egg-info' -exec rm -vr \{\} \;
 
 pipx: ## Install all packages with pipx
diff --git a/py-packages/SimpleWebPage/pyproject.toml b/py-packages/SimpleWebPage/pyproject.toml
new file mode 100644
index 0000000..67ae8bb
--- /dev/null
+++ b/py-packages/SimpleWebPage/pyproject.toml
@@ -0,0 +1,36 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "SimpleWebPage"
+dynamic = ["version"]
+description = 'HTML file index generator.'
+requires-python = ">=3.8"
+license = "MIT"
+keywords = []
+authors = [
+  { name = "Q", email = "q@six9.net" },
+]
+classifiers = [
+  "Development Status :: 4 - Beta",
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3.8",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: Implementation :: CPython",
+  "Programming Language :: Python :: Implementation :: PyPy",
+]
+dependencies = ["markdown>=3.3.4"]
+
+[project.scripts]
+SimpleWebPage="simplewebpage:main"
+simplewebpage="simplewebpage:main"
+
+[tool.hatch.version]
+path = "simplewebpage/__init__.py"
+
+[tool.hatch.build.targets.wheel]
+packages = ["simplewebpage"]
diff --git a/py-packages/TSVFilter/pyproject.toml b/py-packages/TSVFilter/pyproject.toml
new file mode 100644
index 0000000..69598bf
--- /dev/null
+++ b/py-packages/TSVFilter/pyproject.toml
@@ -0,0 +1,35 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "TSVFilter"
+dynamic = ["version"]
+description = 'TSV column filter.'
+requires-python = ">=3.8"
+license = "MIT"
+keywords = []
+authors = [
+  { name = "Q", email = "q@six9.net" },
+]
+classifiers = [
+  "Development Status :: 4 - Beta",
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3.8",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: Implementation :: CPython",
+  "Programming Language :: Python :: Implementation :: PyPy",
+]
+dependencies = []
+
+[project.scripts]
+TSVFilter="TSVFilter:main"
+
+[tool.hatch.version]
+path = "TSVFilter/filter.py"
+
+[tool.hatch.build.targets.wheel]
+packages = ["TSVFilter"]
diff --git a/py-packages/ffmpeg-parser/ffmpegparser/ffmpegparser.py b/py-packages/ffmpeg-parser/ffmpegparser/ffmpegparser.py
index 5860755..b092ae4 100755
--- a/py-packages/ffmpeg-parser/ffmpegparser/ffmpegparser.py
+++ b/py-packages/ffmpeg-parser/ffmpegparser/ffmpegparser.py
@@ -8,7 +8,7 @@ import parse
 from ansi import cursor
 from datetime import datetime
 
-__version__ = 1.2
+__version__ = "1.2"
 
 
 class Chopper:
diff --git a/py-packages/ffmpeg-parser/pyproject.toml b/py-packages/ffmpeg-parser/pyproject.toml
new file mode 100644
index 0000000..b819556
--- /dev/null
+++ b/py-packages/ffmpeg-parser/pyproject.toml
@@ -0,0 +1,35 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "ffmpegparser"
+dynamic = ["version"]
+description = 'View parse ffmpeg and ffprobe output nicer'
+requires-python = ">=3.8"
+license = "MIT"
+keywords = []
+authors = [
+  { name = "Q", email = "q@six9.net" },
+]
+classifiers = [
+  "Development Status :: 4 - Beta",
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3.8",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: Implementation :: CPython",
+  "Programming Language :: Python :: Implementation :: PyPy",
+]
+dependencies = ["ansi","parse"]
+
+[project.scripts]
+ffmpeg-parser = "ffmpegparser.ffmpegparser:main"
+ffprobe-parser = "ffmpegparser.ffprobeparser:main"
+
+
+[tool.hatch.version]
+path = "ffmpegparser/ffmpegparser.py"
+
diff --git a/py-packages/imagelist2/pyproject.toml b/py-packages/imagelist2/pyproject.toml
new file mode 100644
index 0000000..4399f5b
--- /dev/null
+++ b/py-packages/imagelist2/pyproject.toml
@@ -0,0 +1,34 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "imagelist2"
+dynamic = ["version"]
+description = 'Maintains a list of images sqlite file'
+requires-python = ">=3.8"
+license = "MIT"
+keywords = []
+authors = [
+  { name = "Q", email = "q@six9.net" },
+]
+classifiers = [
+  "Development Status :: 4 - Beta",
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3.8",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: Implementation :: CPython",
+  "Programming Language :: Python :: Implementation :: PyPy",
+]
+dependencies = ["PyTurboJPEG", "Pillow", "ImageHash", "numpy", "tqdm"]
+
+[project.scripts]
+image-list = "imagelist2:main"
+
+
+[tool.hatch.version]
+path = "imagelist2/__init__.py"
+
diff --git a/py-packages/markslider/pyproject.toml b/py-packages/markslider/pyproject.toml
new file mode 100644
index 0000000..7b314cb
--- /dev/null
+++ b/py-packages/markslider/pyproject.toml
@@ -0,0 +1,35 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "markslider"
+dynamic = ["version"]
+description = 'View markdown files as slides in terminal'
+requires-python = ">=3.8"
+license = "MIT"
+keywords = []
+authors = [
+  { name = "Q", email = "q@six9.net" },
+]
+classifiers = [
+  "Development Status :: 4 - Beta",
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3.8",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: Implementation :: CPython",
+  "Programming Language :: Python :: Implementation :: PyPy",
+]
+dependencies = ["pygments", "climage"]
+
+[project.scripts]
+markslider = "markslider.markslider:main"
+
+[tool.hatch.version]
+path = "markslider/markslider.py"
+
+[tool.hatch.build.targets.wheel]
+packages = ["markslider"]
diff --git a/py-packages/spiller/pyproject.toml b/py-packages/spiller/pyproject.toml
new file mode 100644
index 0000000..6db8eff
--- /dev/null
+++ b/py-packages/spiller/pyproject.toml
@@ -0,0 +1,35 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "spiller"
+dynamic = ["version"]
+description = 'Very simple password storage, that encrypts with GPG cmdline tool.'
+requires-python = ">=3.8"
+license = "MIT"
+keywords = []
+authors = [
+  { name = "Q", email = "q@six9.net" },
+]
+classifiers = [
+  "Development Status :: 4 - Beta",
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3.8",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: Implementation :: CPython",
+  "Programming Language :: Python :: Implementation :: PyPy",
+]
+dependencies = []
+
+[project.scripts]
+spill="spiller.spiller:main"
+
+[tool.hatch.version]
+path = "spiller/__init__.py"
+
+[tool.hatch.build.targets.wheel]
+packages = ["spiller"]
diff --git a/py-packages/sshtunnelier/pyproject.toml b/py-packages/sshtunnelier/pyproject.toml
new file mode 100644
index 0000000..61d5811
--- /dev/null
+++ b/py-packages/sshtunnelier/pyproject.toml
@@ -0,0 +1,35 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "sshtunnelier"
+dynamic = ["version"]
+description = 'SSH tunnel manager (yet another)'
+requires-python = ">=3.8"
+license = "MIT"
+keywords = []
+authors = [
+  { name = "Q", email = "q@six9.net" },
+]
+classifiers = [
+  "Development Status :: 4 - Beta",
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3.8",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: Implementation :: CPython",
+  "Programming Language :: Python :: Implementation :: PyPy",
+]
+dependencies = ["psutil", "pyyaml"]
+
+[project.scripts]
+ssh-tunnelier = "sshtunnelier:main"
+
+[tool.hatch.version]
+path = "sshtunnelier/__init__.py"
+
+[tool.hatch.build.targets.wheel]
+packages = ["sshtunnelier"]