Index: kde/add/ark.xml
===================================================================
--- kde/add/ark.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
+++ kde/add/ark.xml	(revision 7e8964ee173d9b7b6bce5a0d3dd55eb172ac9239)
@@ -5,13 +5,13 @@
   %general-entities;
 
-  <!ENTITY ark-download-http "&kde-download-http;applications/&ark-version;/src/ark-&ark-version;.tar.xz">
+  <!ENTITY ark-download-http "&kde-download-http;applications/&kde-apps-version;/src/ark-&kde-apps-version;.tar.xz">
   <!ENTITY ark-download-ftp  " ">
-  <!ENTITY ark-md5sum        "e262d982aa4ce30da47a416d76c0c96e">
-  <!ENTITY ark-size          "236 KB">
-  <!ENTITY ark-buildsize     "10.5 MB">
-  <!ENTITY ark-time          "0.4 SBU">
+  <!ENTITY ark-md5sum        "2fe131a931d51603eff33b80d45a73b7">
+  <!ENTITY ark-size          "248 KB">
+  <!ENTITY ark-buildsize     "11.4 MB">
+  <!ENTITY ark-time          "1.1 SBU">
 ]>
 
-<sect1 id="ark" xreflabel="ark-&ark-version;">
+<sect1 id="ark" xreflabel="ark-&kde-apps-version;">
   <?dbhtml filename="ark.html"?>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>Ark-&ark-version;</title>
+  <title>Ark-&kde-apps-version;</title>
 
   <indexterm zone="ark">
Index: kde/add/kdepim-runtime.xml
===================================================================
--- kde/add/kdepim-runtime.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
+++ kde/add/kdepim-runtime.xml	(revision 7e8964ee173d9b7b6bce5a0d3dd55eb172ac9239)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY kdepim-runtime-download-http "&kde-download-http;applications/&kde-apps-version;/src/kdepim-runtime-&kdepim-version;.tar.xz">
+  <!ENTITY kdepim-runtime-download-http "&kde-download-http;applications/&kde-pim-dir;/src/kdepim-runtime-&kdepim-version;.tar.xz">
   <!ENTITY kdepim-runtime-download-ftp  " ">
   <!ENTITY kdepim-runtime-md5sum        "7dd2063acf9b6920920d0118f5576db6">
Index: kde/add/kdepim.xml
===================================================================
--- kde/add/kdepim.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
+++ kde/add/kdepim.xml	(revision 7e8964ee173d9b7b6bce5a0d3dd55eb172ac9239)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY kdepim-download-http "&kde-download-http;applications/&kde-apps-version;/src/kdepim-&kdepim-version;.tar.xz">
+  <!ENTITY kdepim-download-http "&kde-download-http;applications/&kde-pim-dir;/src/kdepim-&kdepim-version;.tar.xz">
   <!ENTITY kdepim-download-ftp  " ">
   <!ENTITY kdepim-md5sum        "a09c9bd838cd71c16e9993e57653a7ad">
Index: kde/add/kmix.xml
===================================================================
--- kde/add/kmix.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
+++ kde/add/kmix.xml	(revision 7e8964ee173d9b7b6bce5a0d3dd55eb172ac9239)
@@ -5,13 +5,13 @@
   %general-entities;
 
-  <!ENTITY kmix-download-http "&kde-download-http;applications/&kmix-version;/src/kmix-&kmix-version;.tar.xz">
+  <!ENTITY kmix-download-http "&kde-download-http;applications/&kde-version;/src/kmix-&kde-version;.tar.xz">
   <!ENTITY kmix-download-ftp  " ">
-  <!ENTITY kmix-md5sum        "228045200142ad716a147a0a3191afa4">
-  <!ENTITY kmix-size          "380 KB">
-  <!ENTITY kmix-buildsize     "11.5 MB">
-  <!ENTITY kmix-time          "0.9 SBU">
+  <!ENTITY kmix-md5sum        "2fe131a931d51603eff33b80d45a73b7">
+  <!ENTITY kmix-size          "248 KB">
+  <!ENTITY kmix-buildsize     "11.4 MB">
+  <!ENTITY kmix-time          "1.1 SBU">
 ]>
 
-<sect1 id="kmix" xreflabel="kmix-&kmix-version;">
+<sect1 id="kmix" xreflabel="kmix-&kde-version;">
   <?dbhtml filename="kmix.html"?>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>Kmix-&kmix-version;</title>
+  <title>Kmix-&kde-version;</title>
 
   <indexterm zone="kmix">
Index: kde/add/libkcddb.xml
===================================================================
--- kde/add/libkcddb.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
+++ kde/add/libkcddb.xml	(revision 7e8964ee173d9b7b6bce5a0d3dd55eb172ac9239)
@@ -7,5 +7,5 @@
   <!ENTITY libkcddb-download-http "&kde-download-http;applications/&kde-apps-version;/src/libkcddb-&kde-apps-version;.tar.xz">
   <!ENTITY libkcddb-download-ftp  " ">
-  <!ENTITY libkcddb-md5sum        "477bbb5030fa769317fe9ee9fd83bf9d">
+  <!ENTITY libkcddb-md5sum        "81b50a2e904067a539a61b725b705553">
   <!ENTITY libkcddb-size          "156 KB">
   <!ENTITY libkcddb-buildsize     "7.7 MB">
Index: kde/add/libkdcraw.xml
===================================================================
--- kde/add/libkdcraw.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
+++ kde/add/libkdcraw.xml	(revision 7e8964ee173d9b7b6bce5a0d3dd55eb172ac9239)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libkdcraw-download-http "&kde-download-http;applications/&kde-apps-version;/src/libkdcraw-&kde-apps-version;.tar.xz">
+  <!ENTITY libkdcraw-download-http "&kde-download-http;applications/&libkdcraw-version;/src/libkdcraw-&libkdcraw-version;.tar.xz">
   <!ENTITY libkdcraw-download-ftp  " ">
   <!ENTITY libkdcraw-md5sum        "ce2c520d99b0ff8108c6944e1ec287bd">
Index: kde/add/libkexiv2.xml
===================================================================
--- kde/add/libkexiv2.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
+++ kde/add/libkexiv2.xml	(revision 7e8964ee173d9b7b6bce5a0d3dd55eb172ac9239)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libkexiv2-download-http "&kde-download-http;applications/&kde-apps-version;/src/libkexiv2-&kde-apps-version;.tar.xz">
+  <!ENTITY libkexiv2-download-http "&kde-download-http;applications/&libkexiv2-version;/src/libkexiv2-&libkexiv2-version;.tar.xz">
   <!ENTITY libkexiv2-download-ftp  " ">
   <!ENTITY libkexiv2-md5sum        "2c30e2ac942e02a9d07e08f42958598e">
Index: kde/add/okular.xml
===================================================================
--- kde/add/okular.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
+++ kde/add/okular.xml	(revision 7e8964ee173d9b7b6bce5a0d3dd55eb172ac9239)
@@ -7,6 +7,6 @@
   <!ENTITY okular-download-http "&kde-download-http;applications/&kde-apps-version;/src/okular-&kde-apps-version;.tar.xz">
   <!ENTITY okular-download-ftp  " ">
-  <!ENTITY okular-md5sum        "339f88c79ae2741deefadcd256ad7367">
-  <!ENTITY okular-size          "1.5 MB">
+  <!ENTITY okular-md5sum        "e3b57ad6d8eb88bd15e6bc9c6e89fd58">
+  <!ENTITY okular-size          "1.7 MB">
   <!ENTITY okular-buildsize     "31 MB">
   <!ENTITY okular-time          "1.4 SBU">
Index: kde/core/kde-base-artwork.xml
===================================================================
--- kde/core/kde-base-artwork.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
+++ kde/core/kde-base-artwork.xml	(revision 7e8964ee173d9b7b6bce5a0d3dd55eb172ac9239)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY kde-base-artwork-download-http "&kde-download-http;applications/&kde-apps-version;/src/kde-base-artwork-&kde-apps-version;.tar.xz">
+  <!ENTITY kde-base-artwork-download-http "&kde-download-http;applications/&kde-base-artwork-version;/src/kde-base-artwork-&kde-base-artwork-version;.tar.xz">
   <!ENTITY kde-base-artwork-download-ftp  " ">
   <!ENTITY kde-base-artwork-md5sum        "99e95461864527323b7cd4b44053e0d3">
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="kde-base-artwork" xreflabel="kde-base-artwork-&kde-apps-version;">
+<sect1 id="kde-base-artwork" xreflabel="kde-base-artwork-&kde-base-artwork-version;">
   <?dbhtml filename="kde-base-artwork.html"?>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>Kde-base-artwork-&kde-apps-version;</title>
+  <title>Kde-base-artwork-&kde-base-artwork-version;</title>
 
   <indexterm zone="kde-base-artwork">
Index: kde/core/kde-baseapps.xml
===================================================================
--- kde/core/kde-baseapps.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
+++ kde/core/kde-baseapps.xml	(revision 7e8964ee173d9b7b6bce5a0d3dd55eb172ac9239)
@@ -7,5 +7,5 @@
   <!ENTITY kde-baseapps-download-http "&kde-download-http;applications/&kde-apps-version;/src/kde-baseapps-&kde-apps-version;.tar.xz">
   <!ENTITY kde-baseapps-download-ftp  " ">
-  <!ENTITY kde-baseapps-md5sum        "b0f615569ef06cb9e6a7efe0b79d3136">
+  <!ENTITY kde-baseapps-md5sum        "c4991c8248b0baf626542ad624b5b143">
   <!ENTITY kde-baseapps-size          "2.0 MB">
   <!ENTITY kde-baseapps-buildsize     "85 MB">
Index: kde/core/kde-runtime.xml
===================================================================
--- kde/core/kde-runtime.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
+++ kde/core/kde-runtime.xml	(revision 7e8964ee173d9b7b6bce5a0d3dd55eb172ac9239)
@@ -7,5 +7,5 @@
   <!ENTITY kde-runtime-download-http "&kde-download-http;applications/&kde-apps-version;/src/kde-runtime-&kde-apps-version;.tar.xz">
   <!ENTITY kde-runtime-download-ftp  " ">
-  <!ENTITY kde-runtime-md5sum        "3f9a69697c66e69f77898114fc897009">
+  <!ENTITY kde-runtime-md5sum        "d033250775a56468f7e478fb844d702f">
   <!ENTITY kde-runtime-size          "7.5 MB">
   <!ENTITY kde-runtime-buildsize     "110 MB">
Index: kde/core/kde-workspace.xml
===================================================================
--- kde/core/kde-workspace.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
+++ kde/core/kde-workspace.xml	(revision 7e8964ee173d9b7b6bce5a0d3dd55eb172ac9239)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY kde-workspace-download-http "&kde-download-http;applications/&kde-apps-version;/src/kde-workspace-&kde-workspace-version;.tar.xz">
-  <!ENTITY kde-workspace-download-ftp  "&kde-download-ftp;applications/&kde-apps-version;/src/kde-workspace-&kde-workspace-version;.tar.xz">
+  <!ENTITY kde-workspace-download-http "&kde-download-http;applications/&kde-workspace-dir;/src/kde-workspace-&kde-workspace-version;.tar.xz">
+  <!ENTITY kde-workspace-download-ftp  "&kde-download-ftp;applications/&kde-workspace-dir;/src/kde-workspace-&kde-workspace-version;.tar.xz">
   <!ENTITY kde-workspace-md5sum        "bd7fa9c894dda23e8d06fc6a49a561cf">
   <!ENTITY kde-workspace-size          "12.9 MB">
Index: kde/core/kdelibs.xml
===================================================================
--- kde/core/kdelibs.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
+++ kde/core/kdelibs.xml	(revision 7e8964ee173d9b7b6bce5a0d3dd55eb172ac9239)
@@ -7,8 +7,8 @@
   <!ENTITY kdelibs-download-http "&kde-download-http;applications/&kde-apps-version;/src/kdelibs-&kde-libs-version;.tar.xz">
   <!ENTITY kdelibs-download-ftp  " ">
-  <!ENTITY kdelibs-md5sum        "890d02d770fbf9c5104cd89d4a090187">
-  <!ENTITY kdelibs-size          "11.0 MB">
-  <!ENTITY kdelibs-buildsize     "474 MB">
-  <!ENTITY kdelibs-time          "21 SBU">
+  <!ENTITY kdelibs-md5sum        "9baf72bc13c7a97eb6a0c153c916a3fb">
+  <!ENTITY kdelibs-size          "11.1 MB">
+  <!ENTITY kdelibs-buildsize     "380` MB">
+  <!ENTITY kdelibs-time          "18 SBU">
 ]>
 
Index: kde/extra-cmake-modules.xml
===================================================================
--- kde/extra-cmake-modules.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
+++ kde/extra-cmake-modules.xml	(revision 7e8964ee173d9b7b6bce5a0d3dd55eb172ac9239)
@@ -5,13 +5,13 @@
   %general-entities;
 
-   <!ENTITY extra-cmake-modules-download-http "&kf5-download-http;/extra-cmake-modules-&kf5-version;.tar.xz">
-   <!ENTITY extra-cmake-modules-download-ftp  "&kf5-download-ftp;/extra-cmake-modules-&kf5-version;.tar.xz">
-   <!ENTITY extra-cmake-modules-md5sum        "5a41b547927190d366501cf61d86ec07">
-   <!ENTITY extra-cmake-modules-size          "132 KB">
-   <!ENTITY extra-cmake-modules-buildsize     "3.4 MB">
+   <!ENTITY extra-cmake-modules-download-http "&kf5-download-http;/extra-cmake-modules-&extra-cmake-modules-version;.tar.xz">
+   <!ENTITY extra-cmake-modules-download-ftp  "&kf5-download-ftp;/extra-cmake-modules-&extra-cmake-modules-version;.tar.xz">
+   <!ENTITY extra-cmake-modules-md5sum        "dedb4a47cc8f850078792b5404de0d43">
+   <!ENTITY extra-cmake-modules-size          "140 KB">
+   <!ENTITY extra-cmake-modules-buildsize     "3.5 MB">
    <!ENTITY extra-cmake-modules-time          "less than 0.1 SBU">
 ]>
 
-<sect1 id="extra-cmake-modules" xreflabel="extra-cmake-modules-&kf5-version;">
+<sect1 id="extra-cmake-modules" xreflabel="extra-cmake-modules-&extra-cmake-modules-version;">
   <?dbhtml filename="extra-cmake-modules.html"?>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>extra-cmake-modules-&kf5-version;</title>
+  <title>extra-cmake-modules-&extra-cmake-modules-version;</title>
 
   <indexterm zone="extra-cmake-modules">
