diff --git a/packages-any/mlc.toml b/packages-any/mlc.toml
index 8503925..28ed080 100644
--- a/packages-any/mlc.toml
+++ b/packages-any/mlc.toml
@@ -1,43 +1,57 @@
+[base]
 mode = "repository"
+smart_pull = true
+
+[mode.repository]
 name = "crystal-any"
-repo = [
-	"1::citrine",
-	"1::crystal-keyring",
-	"1::onyx",
-	"1::wallpapers",
-	"2::base",
-	"2::cinnamon-meta",
-	"2::crystal-dev",
-	"2::crystal-grub-theme",
-	"2::filesystem",
-	"2::gnome-apps-meta",
-	"2::lsb-release",
-	"2::neofetch",
-	"2::pfetch",
-	"2::pkg-warner",
-#	"2::whitesur-grub-theme",
-	"3::chrome-gnome-shell",
-	"3::ckbcomp",
-	"3::flutter",
-	"3::flutter-group-pacman-hook",
-	"3::iso-flag-png",
-	"3::mint-artwork-common",
-	"3::mint-backgrounds-uma",
-	"3::mint-themes",
-	"3::mint-x-icons",
-	"3::mint-y-icons",
-	"3::mintlocale",
-	"3::mkinitcpio-openswap",
-	"3::pix",
-	"3::python-xdg",
-	"3::timeshift",
-	"3::timeshift-autosnap",
-	"3::xplayer",
-	"3::xplayer-plparser",
-	"3::xviewer"
-]
-urls = [
-	"https://github.com/crystal-linux/%repo%",
-	"https://github.com/crystal-linux/pkgbuild.%repo%",
-	"https://aur.archlinux.org/%repo%"
+build_on_update = true
+
+[mode.repository.signing]
+enabled = true
+key = ""
+on_gen = true
+
+[mode.workspace]
+
+[repositories]
+repos = [
+	"crs:citrine",
+	"crs:crystal-keyring",
+	"crs:onyx",
+	"crs:wallpapers",
+	"pkg:base",
+	"pkg:cinnamon-meta",
+	"pkg:crystal-dev",
+	"pkg:crystal-grub-theme",
+	"pkg:filesystem",
+	"pkg:gnome-apps-meta",
+	"pkg:lsb-release",
+	"pkg:neofetch",
+	"pkg:pfetch",
+	"pkg:pkg-warner",
+#	"pkg:whitesur-grub-theme",
+	"aur:chrome-gnome-shell",
+	"aur:ckbcomp",
+	"aur:flutter",
+	"aur:flutter-group-pacman-hook",
+	"aur:iso-flag-png",
+	"aur:mint-artwork-common",
+	"aur:mint-backgrounds-uma",
+	"aur:mint-themes",
+	"aur:mint-x-icons",
+	"aur:mint-y-icons",
+	"aur:mintlocale",
+	"aur:mkinitcpio-openswap",
+	"aur:pix",
+	"aur:python-xdg",
+	"aur:timeshift",
+	"aur:timeshift-autosnap",
+	"aur:xplayer",
+	"aur:xplayer-plparser",
+	"aur:xviewer"
 ]
+
+[repositories.urls]
+crs = "https://github.com/crystal-linux/{}"
+pkg = "https://github.com/crystal-linux/pkgbuild.{}"
+aur = "https://aur.archlinux.org/{}"
diff --git a/packages-armv7l/mlc.toml b/packages-armv7l/mlc.toml
deleted file mode 100644
index c0ee8c6..0000000
--- a/packages-armv7l/mlc.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-mode = "repository"
-name = "crystal-armv7l"
-repo = [
-	"1::amethyst",
-	"1::malachite",
-]
-urls = [
-	"https://github.com/crystal-linux/%repo%"
-]
diff --git a/packages-extra/mlc.toml b/packages-extra/mlc.toml
index a2a54bf..d80891b 100644
--- a/packages-extra/mlc.toml
+++ b/packages-extra/mlc.toml
@@ -1,21 +1,35 @@
+[base]
 mode = "repository"
+smart_pull = true
+
+[mode.repository]
 name = "crystal-extra"
-repo = [
-	"1::brave-bin",
-	"1::mullvad-vpn",
-	"1::mullvad-vpn-beta",
-	"1::mullvad-vpn-cli",
-	"1::microsoft-edge-stable-bin",
-	"1::microsoft-edge-beta-bin",
-	"1::microsoft-edge-dev-bin",
-	"1::google-chrome",
-	"1::google-chrome-beta",
-	"1::google-chrome-dev",
-	"1::ungoogled-chromium",
-	"1::jetbrains-toolbox",
-	"1::visual-studio-code-bin",
-	"1::polymc"
-]
-urls = [
-	"https://aur.archlinux.org/%repo%"
+build_on_update = true
+
+[mode.repository.signing]
+enabled = true
+key = ""
+on_gen = true
+
+[mode.workspace]
+
+[repositories]
+repos = [
+	"aur:brave-bin",
+	"aur:mullvad-vpn",
+	"aur:mullvad-vpn-beta",
+	"aur:mullvad-vpn-cli",
+	"aur:microsoft-edge-stable-bin",
+	"aur:microsoft-edge-beta-bin",
+	"aur:microsoft-edge-dev-bin",
+	"aur:google-chrome",
+	"aur:google-chrome-beta",
+	"aur:google-chrome-dev",
+	"aur:ungoogled-chromium",
+	"aur:jetbrains-toolbox",
+	"aur:visual-studio-code-bin",
+	"aur:polymc"
 ]
+
+[repositories.urls]
+aur = "https://aur.archlinux.org/{}"
diff --git a/packages-x86_64/mlc.toml b/packages-x86_64/mlc.toml
index 5ba8459..07a3b84 100644
--- a/packages-x86_64/mlc.toml
+++ b/packages-x86_64/mlc.toml
@@ -1,16 +1,30 @@
+[base]
 mode = "repository"
+smart_pull = true
+
+[mode.repository]
 name = "crystal-x86_64"
-repo = [
-	"1::amethyst",
-	"1::jade",
-	"1::jade_gui",
-	"1::lapis",
-	"1::malachite",
-	"2::bsudo",
-	"2::grub",
-	"2::sudo"
-]
-urls = [
-	"https://github.com/crystal-linux/%repo%",
-	"https://github.com/crystal-linux/pkgbuild.%repo%"
+build_on_update = true
+
+[mode.repository.signing]
+enabled = true
+key = ""
+on_gen = true
+
+[mode.workspace]
+
+[repositories]
+repos = [
+	"crs:amethyst",
+	"crs:jade",
+	"crs:jade_gui",
+	"crs:lapis",
+	"crs:malachite",
+	"pkg:bsudo",
+	"pkg:grub",
+	"pkg:sudo"
 ]
+
+[repositories.urls]
+crs = "https://github.com/crystal-linux/{}"
+pkg = "https://github.com/crystal-linux/pkgbuild.{}"
diff --git a/workspace/mlc.toml b/workspace/mlc.toml
index 82cd48c..1cb0de0 100644
--- a/workspace/mlc.toml
+++ b/workspace/mlc.toml
@@ -1,32 +1,42 @@
+[base]
 mode = "workspace"
+smart_pull = true
 
-repo = [
-	"1::amethyst",
-	"1::branding",
-	"1::caveman",
-	"1::citrine",
-	"1::crystal-keyring",
-	"1::grub-theme",
-	"1::iso", 
-	"1::jade", 
-	"1::jade_gui",
-	"1::onyx",
-	"1::site",
-	"1::wallpapers",
-#	"1::packages-any", 
-#	"1::packages-extra", 
-#	"1::packages-x86_64",
-	"2::base", 
-	"2::filesystem",
-	"2::gnome-apps-meta",
-	"2::grub",
-	"2::lsb-release",
-	"2::malachite",
-	"2::pkg-manager-warner",
-	"2::sudo"
-]
+[mode.repository]
+name = ""
+build_on_update = false
+
+[mode.repository.signing]
+enabled = false
+key = ""
+on_gen = false
 
-urls = [
-	"ssh://git@github.com/crystal-linux/%repo%",
-	"ssh://git@github.com/crystal-linux/pkgbuild.%repo%"
+[mode.workspace]
+
+[repositories]
+repos = [
+	"crs:amethyst",
+	"crs:branding",
+	"crs:caveman",
+	"crs:citrine",
+	"crs:crystal-keyring",
+	"crs:grub-theme",
+	"crs:iso", 
+	"crs:jade", 
+	"crs:jade_gui",
+	"crs:onyx",
+	"crs:site",
+	"crs:wallpapers",
+	"pkg:base", 
+	"pkg:filesystem",
+	"pkg:gnome-apps-meta",
+	"pkg:grub",
+	"pkg:lsb-release",
+	"pkg:malachite",
+	"pkg:pkg-manager-warner",
+	"pkg:sudo"
 ]
+
+[repositories.urls]
+crs = "ssh://git@github.com/crystal-linux/{}"
+pkg = "ssh://git@github.com/crystal-linux/pkgbuild.{}"