diff --git a/0install/0publish.xml b/0install/0publish.xml
index 600751b76..20542d2dd 100644
--- a/0install/0publish.xml
+++ b/0install/0publish.xml
@@ -17,151 +17,138 @@ A tutorial on 0publish can be found at https://docs.0install.net/packaging/.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/0install/0repo.xml b/0install/0repo.xml
index 2240a0a5e..5c48b34ee 100644
--- a/0install/0repo.xml
+++ b/0install/0repo.xml
@@ -136,8 +136,15 @@
-
-
+
+
+
+
+
+
+
+
+
@@ -148,18 +155,11 @@
-
-
-
-
-
-
-
-
+
-
+
diff --git a/0install/0template.xml b/0install/0template.xml
index 5d92af450..a7daea5ec 100644
--- a/0install/0template.xml
+++ b/0install/0template.xml
@@ -18,62 +18,50 @@
-
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
diff --git a/0watch-windows.xml.selections b/0watch-windows.xml.selections
deleted file mode 100644
index 32b9bb95d..000000000
--- a/0watch-windows.xml.selections
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
- 0watch
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/watch.ps1 b/watch.ps1
index 439644820..3051301f4 100644
--- a/watch.ps1
+++ b/watch.ps1
@@ -8,8 +8,7 @@ foreach ($file in (ls -Recurse -Filter *.watch.py).FullName) {
$header = Get-Content $file -TotalCount 1
if (($header -eq "#os=Windows") -or (-not $header.StartsWith("#os="))) {
echo $file
- #.\0install.ps1 run --batch https://apps.0install.net/0install/0watch.xml --output ..\incoming $file
- .\0install.ps1 run --batch 0watch-windows.xml.selections --output ..\incoming $file
+ .\0install.ps1 run --batch https://apps.0install.net/0install/0watch.xml --output ..\incoming $file
if ($LASTEXITCODE -ne 0) {throw "Exit Code: $LASTEXITCODE"}
}
}