Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 kde-gear/analitza/DETAILS                 |    4 ++--
 kde-gear/ark/DETAILS                      |    4 ++--
 kde-gear/audiocd-kio/DETAILS              |    4 ++--
 kde-gear/baloo-widgets/DETAILS            |    4 ++--
 kde-gear/bovo/DETAILS                     |    4 ++--
 kde-gear/calindori/DETAILS                |    4 ++--
 kde-gear/cantor/DETAILS                   |    4 ++--
 kde-gear/dolphin-plugins/DETAILS          |    4 ++--
 kde-gear/dolphin/DETAILS                  |    4 ++--
 kde-gear/dragon/DETAILS                   |    4 ++--
 kde-gear/elisa/DETAILS                    |    4 ++--
 kde-gear/falkon/DETAILS                   |    4 ++--
 kde-gear/ffmpegthumbs/DETAILS             |    4 ++--
 kde-gear/ghostwriter/DETAILS              |    4 ++--
 kde-gear/granatier/DETAILS                |    4 ++--
 kde-gear/gwenview/DETAILS                 |    4 ++--
 kde-gear/juk/DETAILS                      |    4 ++--
 kde-gear/k3b/DETAILS                      |    5 ++---
 kde-gear/kaccounts-integration/DETAILS    |    4 ++--
 kde-gear/kaccounts-providers/DETAILS      |    4 ++--
 kde-gear/kalgebra/DETAILS                 |    4 ++--
 kde-gear/kalzium/DETAILS                  |    4 ++--
 kde-gear/kamera/DETAILS                   |    4 ++--
 kde-gear/kamoso/DETAILS                   |    4 ++--
 kde-gear/kanagram/DETAILS                 |    4 ++--
 kde-gear/kate/DETAILS                     |    4 ++--
 kde-gear/katomic/DETAILS                  |    4 ++--
 kde-gear/kbackup/DETAILS                  |    5 ++---
 kde-gear/kbruch/DETAILS                   |    4 ++--
 kde-gear/kcalc/DETAILS                    |    4 ++--
 kde-gear/kcharselect/DETAILS              |    4 ++--
 kde-gear/kcolorchooser/DETAILS            |    4 ++--
 kde-gear/kdeconnect/DETAILS               |    9 ++++-----
 kde-gear/kdeedu-data/DETAILS              |    4 ++--
 kde-gear/kdegraphics-thumbnailers/DETAILS |    4 ++--
 kde-gear/kdenlive/DETAILS                 |    4 ++--
 kde-gear/kdevelop/DETAILS                 |   12 ++++++------
 kde-gear/kdf/DETAILS                      |    8 ++++----
 kde-gear/kdialog/DETAILS                  |    4 ++--
 kde-gear/kdiamond/DETAILS                 |    4 ++--
 kde-gear/keditbookmarks/DETAILS           |    4 ++--
 kde-gear/keysmith/DETAILS                 |    4 ++--
 kde-gear/kfind/DETAILS                    |    4 ++--
 kde-gear/kfourinline/DETAILS              |    4 ++--
 kde-gear/kgeography/DETAILS               |    4 ++--
 kde-gear/kget/DETAILS                     |    4 ++--
 kde-gear/kgpg/DETAILS                     |    4 ++--
 kde-gear/khangman/DETAILS                 |    4 ++--
 kde-gear/khealthcertificate/DETAILS       |    5 +++--
 kde-gear/khelpcenter/DETAILS              |    4 ++--
 kde-gear/kig/DETAILS                      |    4 ++--
 kde-gear/kigo/DETAILS                     |    5 ++---
 kde-gear/kimagemapeditor/DETAILS          |    4 ++--
 kde-gear/kio-extras/DETAILS               |    4 ++--
 kde-gear/kirigami-gallery/DETAILS         |    4 ++--
 kde-gear/kiriki/DETAILS                   |    4 ++--
 kde-gear/kiten/DETAILS                    |    4 ++--
 kde-gear/klettres/DETAILS                 |    4 ++--
 kde-gear/kmag/DETAILS                     |    4 ++--
 kde-gear/kmahjongg/DETAILS                |    4 ++--
 kde-gear/kmines/DETAILS                   |    4 ++--
 kde-gear/kmix/DETAILS                     |    4 ++--
 kde-gear/kmousetool/DETAILS               |    4 ++--
 kde-gear/kmouth/DETAILS                   |   13 ++++++++-----
 kde-gear/kmplot/DETAILS                   |    4 ++--
 kde-gear/knavalbattle/DETAILS             |    4 ++--
 kde-gear/koko/DETAILS                     |    4 ++--
 kde-gear/kollision/DETAILS                |    4 ++--
 kde-gear/kolourpaint/DETAILS              |    4 ++--
 kde-gear/kompare/DETAILS                  |    4 ++--
 kde-gear/konqueror/DETAILS                |    4 ++--
 kde-gear/konsole/DETAILS                  |    4 ++--
 kde-gear/konversation/DETAILS             |    6 +++---
 kde-gear/kopeninghours/DETAILS            |    4 ++--
 kde-gear/kopete/DETAILS                   |    4 ++--
 kde-gear/kpat/DETAILS                     |    4 ++--
 kde-gear/kpmcore/DETAILS                  |    4 ++--
 kde-gear/kqtquickcharts/DETAILS           |    4 ++--
 kde-gear/kreversi/DETAILS                 |    5 ++---
 kde-gear/kruler/DETAILS                   |    4 ++--
 kde-gear/ksanecore/DETAILS                |    3 ++-
 kde-gear/kshisen/DETAILS                  |    4 ++--
 kde-gear/ksudoku/DETAILS                  |    5 ++---
 kde-gear/ktimer/DETAILS                   |    4 ++--
 kde-gear/ktorrent/DETAILS                 |    4 ++--
 kde-gear/ktouch/DETAILS                   |    4 ++--
 kde-gear/ktuberling/DETAILS               |    4 ++--
 kde-gear/kturtle/DETAILS                  |    4 ++--
 kde-gear/kubrick/DETAILS                  |    5 ++---
 kde-gear/kwalletmanager/DETAILS           |    4 ++--
 kde-gear/kwave/DETAILS                    |    4 ++--
 kde-gear/kweather/DETAILS                 |    3 ++-
 kde-gear/kwordquiz/DETAILS                |    4 ++--
 kde-gear/libkcddb/DETAILS                 |    4 ++--
 kde-gear/libkcompactdisc/DETAILS          |    4 ++--
 kde-gear/libkdcraw/DETAILS                |    4 ++--
 kde-gear/libkdegames/DETAILS              |    4 ++--
 kde-gear/libkeduvocdocument/DETAILS       |    4 ++--
 kde-gear/libkexiv2/DETAILS                |    4 ++--
 kde-gear/libkmahjongg/DETAILS             |    4 ++--
 kde-gear/libkomparediff2/DETAILS          |    4 ++--
 kde-gear/libksane/DETAILS                 |    4 ++--
 kde-gear/libktorrent/DETAILS              |    6 +++---
 kde-gear/lokalize/DETAILS                 |    4 ++--
 kde-gear/marble/DETAILS                   |    4 ++--
 kde-gear/minuet/DETAILS                   |    4 ++--
 kde-gear/mobipocket/DETAILS               |    9 ++++-----
 kde-gear/neochat/DETAILS                  |    4 ++--
 kde-gear/okular/DETAILS                   |    4 ++--
 kde-gear/palapeli/DETAILS                 |    4 ++--
 kde-gear/parley/DETAILS                   |    4 ++--
 kde-gear/partitionmanager/DETAILS         |    6 +++---
 kde-gear/print-manager/DETAILS            |    4 ++--
 kde-gear/rocs/DETAILS                     |    4 ++--
 kde-gear/signon-kwallet-extension/DETAILS |    4 ++--
 kde-gear/skanlite/DETAILS                 |    4 ++--
 kde-gear/skanpage/DETAILS                 |    4 ++--
 kde-gear/spectacle/DETAILS                |    4 ++--
 kde-gear/step/DETAILS                     |    4 ++--
 kde-gear/svgpart/DETAILS                  |    4 ++--
 kde-gear/sweeper/DETAILS                  |   13 ++++++++-----
 kde-gear/tokodon/DETAILS                  |    4 ++--
 kde-gear/yakuake/DETAILS                  |    8 ++++----
 kde-gear/zanshin/DETAILS                  |    4 ++--
 124 files changed, 276 insertions(+), 275 deletions(-)

New commits:
commit cc21ca67ccb16555d6fe3ba3e37734ca51329979
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kde-gear/* - normalise web_site

diff --git a/kde-gear/analitza/DETAILS b/kde-gear/analitza/DETAILS
index ba2a0ab..131f137 100755
--- a/kde-gear/analitza/DETAILS
+++ b/kde-gear/analitza/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=analitza
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//analitza
+        WEB_SITE=https://apps.kde.org
          ENTERED=20111028
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/ark/DETAILS b/kde-gear/ark/DETAILS
index 4fb94f7..4c832f2 100644
--- a/kde-gear/ark/DETAILS
+++ b/kde-gear/ark/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=ark
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/utilities/ark
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110821
   SECURITY_PATCH=2
       LICENSE[0]=GPL
diff --git a/kde-gear/audiocd-kio/DETAILS b/kde-gear/audiocd-kio/DETAILS
index 8e5104e..e163e5f 100755
--- a/kde-gear/audiocd-kio/DETAILS
+++ b/kde-gear/audiocd-kio/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=audiocd-kio
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=audiocd-kio.git
+        WEB_SITE=https://apps.kde.org
       LICENSE[0]="GPL"
          ENTERED=20120208
         KEYWORDS=""
diff --git a/kde-gear/baloo-widgets/DETAILS b/kde-gear/baloo-widgets/DETAILS
index 0fdf5b3..7e6e20e 100755
--- a/kde-gear/baloo-widgets/DETAILS
+++ b/kde-gear/baloo-widgets/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=baloo-widgets
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//baloo-widgets
+        WEB_SITE=https://apps.kde.org
          ENTERED=20140506
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/bovo/DETAILS b/kde-gear/bovo/DETAILS
index 591ea71..f9568e9 100755
--- a/kde-gear/bovo/DETAILS
+++ b/kde-gear/bovo/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=bovo
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/games/bovo
+        WEB_SITE=https://apps.kde.org
          ENTERED=20140909
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/calindori/DETAILS b/kde-gear/calindori/DETAILS
index d1fd3bf..524b710 100755
--- a/kde-gear/calindori/DETAILS
+++ b/kde-gear/calindori/DETAILS
@@ -3,13 +3,13 @@ source $GRIMOIRE/KDE_VERSIONS
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
          SOURCE2=$SOURCE.sig
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$KDE_VERSION/src/$SOURCE
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+        WEB_SITE=https://apps.kde.org
 
-        WEB_SITE=https://cgi.kde.org/calindori.git/about
          ENTERED=20200912
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL3
diff --git a/kde-gear/cantor/DETAILS b/kde-gear/cantor/DETAILS
index ec8d031..73fdc1a 100755
--- a/kde-gear/cantor/DETAILS
+++ b/kde-gear/cantor/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=cantor
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://edu.kde.org/release-service/mathematics/cantor
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110218
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/dolphin-plugins/DETAILS 
b/kde-gear/dolphin-plugins/DETAILS
index 411e69e..2b093e4 100644
--- a/kde-gear/dolphin-plugins/DETAILS
+++ b/kde-gear/dolphin-plugins/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
           SPELL=dolphin-plugins
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//dolphin-plugins
+        WEB_SITE=https://apps.kde.org
          ENTERED=20150228
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/dolphin/DETAILS b/kde-gear/dolphin/DETAILS
index 66118a9..900e29e 100644
--- a/kde-gear/dolphin/DETAILS
+++ b/kde-gear/dolphin/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
           SPELL=dolphin
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/system/dolphin
+        WEB_SITE=https://apps.kde.org
          ENTERED=20140629
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/dragon/DETAILS b/kde-gear/dragon/DETAILS
index 99e860e..8ad377e 100755
--- a/kde-gear/dragon/DETAILS
+++ b/kde-gear/dragon/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=dragon
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//dragon
+        WEB_SITE=https://apps.kde.org
          ENTERED=2012-03-30
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/elisa/DETAILS b/kde-gear/elisa/DETAILS
index e5238c3..2796335 100755
--- a/kde-gear/elisa/DETAILS
+++ b/kde-gear/elisa/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
           SPELL=elisa
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=elisa.git
+        WEB_SITE=https://apps.kde.org
          ENTERED=20170511
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/falkon/DETAILS b/kde-gear/falkon/DETAILS
index f81d96a..9221547 100755
--- a/kde-gear/falkon/DETAILS
+++ b/kde-gear/falkon/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=falkon
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.falkon.org
+        WEB_SITE=https://apps.kde.org
       LICENSE[0]=GPL
          ENTERED=20170827
            SHORT=""
diff --git a/kde-gear/ffmpegthumbs/DETAILS b/kde-gear/ffmpegthumbs/DETAILS
index 0348ba6..88bc480 100755
--- a/kde-gear/ffmpegthumbs/DETAILS
+++ b/kde-gear/ffmpegthumbs/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=ffmpegthumbs
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//ffmpegthumbs
+        WEB_SITE=https://apps.kde.org
       LICENSE[0]="GPL"
          ENTERED=20120208
         KEYWORDS=""
diff --git a/kde-gear/ghostwriter/DETAILS b/kde-gear/ghostwriter/DETAILS
index 309d4b8..7f74c94 100755
--- a/kde-gear/ghostwriter/DETAILS
+++ b/kde-gear/ghostwriter/DETAILS
@@ -3,13 +3,13 @@ source $GRIMOIRE/KDE_VERSIONS
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
          SOURCE2=$SOURCE.sig
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$KDE_VERSION/src/$SOURCE
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+        WEB_SITE=https://apps.kde.org
 
-        WEB_SITE=https://apps.kde.org/en-gb/$SPELL
           ENTERED=20221008
           LICENSE=GPL3
         KEYWORDS="kde"
diff --git a/kde-gear/granatier/DETAILS b/kde-gear/granatier/DETAILS
index c42d769..da1fe5d 100755
--- a/kde-gear/granatier/DETAILS
+++ b/kde-gear/granatier/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=granatier
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/games/granatier
+        WEB_SITE=https://apps.kde.org
          ENTERED=20120820
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/gwenview/DETAILS b/kde-gear/gwenview/DETAILS
index 88ded83..7cc0216 100755
--- a/kde-gear/gwenview/DETAILS
+++ b/kde-gear/gwenview/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=gwenview
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/graphics/gwenview
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110219
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/juk/DETAILS b/kde-gear/juk/DETAILS
index b1516df..5048726 100755
--- a/kde-gear/juk/DETAILS
+++ b/kde-gear/juk/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=juk
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=juk.git
+        WEB_SITE=https://apps.kde.org
       LICENSE[0]="GPL"
          ENTERED=20171011
         KEYWORDS=""
diff --git a/kde-gear/k3b/DETAILS b/kde-gear/k3b/DETAILS
index 7153ae2..f7a798c 100755
--- a/kde-gear/k3b/DETAILS
+++ b/kde-gear/k3b/DETAILS
@@ -2,15 +2,14 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=k3b
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=k3b.git
+        WEB_SITE=https://apps.kde.org
 
-        WEB_SITE=https://k3b.plainblack.com
          ENTERED=20080501
       LICENSE[0]=GPL
         KEYWORDS="burning dvd disk kde4"
diff --git a/kde-gear/kaccounts-integration/DETAILS 
b/kde-gear/kaccounts-integration/DETAILS
index 1ef43b4..255963e 100755
--- a/kde-gear/kaccounts-integration/DETAILS
+++ b/kde-gear/kaccounts-integration/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kaccounts-integration
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//kaccounts-integration
+        WEB_SITE=https://apps.kde.org
          ENTERED=20150523
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kaccounts-providers/DETAILS 
b/kde-gear/kaccounts-providers/DETAILS
index 17d4388..82d8dab 100755
--- a/kde-gear/kaccounts-providers/DETAILS
+++ b/kde-gear/kaccounts-providers/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kaccounts-providers
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//kaccounts-providers
+        WEB_SITE=https://apps.kde.org
          ENTERED=20150523
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kalgebra/DETAILS b/kde-gear/kalgebra/DETAILS
index 8b23e94..51879f8 100755
--- a/kde-gear/kalgebra/DETAILS
+++ b/kde-gear/kalgebra/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kalgebra
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://edu.kde.org/release-service/mathematics/kalgebra
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110218
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kalzium/DETAILS b/kde-gear/kalzium/DETAILS
index de56f75..35bf82f 100755
--- a/kde-gear/kalzium/DETAILS
+++ b/kde-gear/kalzium/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kalzium
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=kalzium/.git
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110218
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kamera/DETAILS b/kde-gear/kamera/DETAILS
index 2bd915e..c3fe675 100755
--- a/kde-gear/kamera/DETAILS
+++ b/kde-gear/kamera/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kamera
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//kamera
+        WEB_SITE=https://apps.kde.org
          ENTERED=20151216
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kamoso/DETAILS b/kde-gear/kamoso/DETAILS
index 8e136cd..a18df8d 100755
--- a/kde-gear/kamoso/DETAILS
+++ b/kde-gear/kamoso/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kamoso
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//kamoso
+        WEB_SITE=https://apps.kde.org
          ENTERED=20150101
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kanagram/DETAILS b/kde-gear/kanagram/DETAILS
index 7689457..26c0848 100755
--- a/kde-gear/kanagram/DETAILS
+++ b/kde-gear/kanagram/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kanagram
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://edu.kde.org/release-service/language/kanagram
+        WEB_SITE=https://apps.kde.org
          ENTERED=20140815
       LICENSE[0]=GPL
         KEYWORDS="kde5"
diff --git a/kde-gear/kate/DETAILS b/kde-gear/kate/DETAILS
index 3965df1..f96b796 100755
--- a/kde-gear/kate/DETAILS
+++ b/kde-gear/kate/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kate
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/utilities/kate
+        WEB_SITE=https://apps.kde.org
        LICENSE[0]=GPL
          ENTERED=20131129
         KEYWORDS="KF5"
diff --git a/kde-gear/katomic/DETAILS b/kde-gear/katomic/DETAILS
index b22a096..0ec7d1b 100755
--- a/kde-gear/katomic/DETAILS
+++ b/kde-gear/katomic/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=katomic
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/games/katomic
+        WEB_SITE=https://apps.kde.org
          ENTERED=20141202
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kbackup/DETAILS b/kde-gear/kbackup/DETAILS
index 366fbf3..5a42078 100755
--- a/kde-gear/kbackup/DETAILS
+++ b/kde-gear/kbackup/DETAILS
@@ -2,15 +2,14 @@ source $GRIMOIRE/KDE_VERSIONS
           SPELL=kbackup
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=kbackup/.git
+        WEB_SITE=https://apps.kde.org
 
-        WEB_SITE=https://cgit.kde.org/kbackup.g
          ENTERED=20180218
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kbruch/DETAILS b/kde-gear/kbruch/DETAILS
index ac8c47f..19d45b8 100755
--- a/kde-gear/kbruch/DETAILS
+++ b/kde-gear/kbruch/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kbruch
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//kbruch
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110803
       LICENSE[0]=GPL
         KEYWORDS="kde5"
diff --git a/kde-gear/kcalc/DETAILS b/kde-gear/kcalc/DETAILS
index 8150980..9565cc5 100644
--- a/kde-gear/kcalc/DETAILS
+++ b/kde-gear/kcalc/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kcalc
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/utilities/kcalc
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110821
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kcharselect/DETAILS b/kde-gear/kcharselect/DETAILS
index 30596be..cadcb9e 100644
--- a/kde-gear/kcharselect/DETAILS
+++ b/kde-gear/kcharselect/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kcharselect
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/utilities/kcharselect
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110821
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kcolorchooser/DETAILS b/kde-gear/kcolorchooser/DETAILS
index 23b1234..3eb5999 100755
--- a/kde-gear/kcolorchooser/DETAILS
+++ b/kde-gear/kcolorchooser/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kcolorchooser
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/graphics/kcolorchooser
+        WEB_SITE=https://apps.kde.org
          ENTERED=20160324
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kdeconnect/DETAILS b/kde-gear/kdeconnect/DETAILS
index cdb637a..eaef631 100755
--- a/kde-gear/kdeconnect/DETAILS
+++ b/kde-gear/kdeconnect/DETAILS
@@ -1,15 +1,14 @@
 source $GRIMOIRE/KDE_VERSIONS
            SPELL=kdeconnect
-          SPELLX=$SPELL-kde
          VERSION=$KDE_VERSION
-          SOURCE=$SPELLX-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
+          SOURCE=$SPELL-$VERSION.tar.xz
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
-        WEB_SITE=https://kdeconnect.kde.org/
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+        WEB_SITE=https://apps.kde.org
          ENTERED=20150201
   SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kdeedu-data/DETAILS b/kde-gear/kdeedu-data/DETAILS
index c337ca8..ebe66ef 100644
--- a/kde-gear/kdeedu-data/DETAILS
+++ b/kde-gear/kdeedu-data/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kdeedu-data
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//kdeedu-data
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110211
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kdegraphics-thumbnailers/DETAILS 
b/kde-gear/kdegraphics-thumbnailers/DETAILS
index b805196..fdff47f 100755
--- a/kde-gear/kdegraphics-thumbnailers/DETAILS
+++ b/kde-gear/kdegraphics-thumbnailers/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kdegraphics-thumbnailers
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//kdegraphics-thumbnailers
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110219
       LICENSE[0]=GPL
         KEYWORDS="kde4"
diff --git a/kde-gear/kdenlive/DETAILS b/kde-gear/kdenlive/DETAILS
index 1ff8d7a..d756cfe 100755
--- a/kde-gear/kdenlive/DETAILS
+++ b/kde-gear/kdenlive/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kdenlive
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//kdenlive
+        WEB_SITE=https://apps.kde.org
       LICENSE[0]=GPL
          ENTERED=20030113
             DOCS="README"
diff --git a/kde-gear/kdevelop/DETAILS b/kde-gear/kdevelop/DETAILS
index 4214462..54bd475 100755
--- a/kde-gear/kdevelop/DETAILS
+++ b/kde-gear/kdevelop/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kdevelop
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
-         SOURCE2=$SOURCE.asc
-  SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
-      SOURCE_GPG=kde.gpg:$SOURCE.asc:UPSTREAM_KEY
+         SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
+  SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+      SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION}
-        WEB_SITE=https://www.kdevelop.org/
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+        WEB_SITE=https://apps.kde.org
          ENTERED=20080217
       LICENSE[0]=GPL
         KEYWORDS="ide kde"
diff --git a/kde-gear/kdf/DETAILS b/kde-gear/kdf/DETAILS
index cc5bfe5..c23bd1a 100755
--- a/kde-gear/kdf/DETAILS
+++ b/kde-gear/kdf/DETAILS
@@ -1,14 +1,14 @@
 source $GRIMOIRE/KDE_VERSIONS
            SPELL=kdf
          VERSION=$KDE_VERSION
-          SOURCE="${SPELL}-${VERSION}.tar.xz"
-   
SOURCE_URL[0]=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/${SOURCE}
+          SOURCE=$SPELL-$VERSION.tar.xz
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
-        WEB_SITE="https://kde.org/release-service/system/kdiskfree/";
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+        WEB_SITE=https://apps.kde.org
       LICENSE[0]="GPL"
          ENTERED=20160723
         KEYWORDS=""
diff --git a/kde-gear/kdialog/DETAILS b/kde-gear/kdialog/DETAILS
index e79c856..83b06e9 100644
--- a/kde-gear/kdialog/DETAILS
+++ b/kde-gear/kdialog/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
           SPELL=kdialog
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=kdialog/.git
+        WEB_SITE=https://apps.kde.org
          ENTERED=20140629
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kdiamond/DETAILS b/kde-gear/kdiamond/DETAILS
index e5860e5..8c6d43e 100755
--- a/kde-gear/kdiamond/DETAILS
+++ b/kde-gear/kdiamond/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kdiamond
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/games/kdiamond
+        WEB_SITE=https://apps.kde.org
          ENTERED=20141202
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/keditbookmarks/DETAILS b/kde-gear/keditbookmarks/DETAILS
index b347180..35d344f 100644
--- a/kde-gear/keditbookmarks/DETAILS
+++ b/kde-gear/keditbookmarks/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
           SPELL=keditbookmarks
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=keditbookmarks/.git
+        WEB_SITE=https://apps.kde.org
          ENTERED=20141007
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/keysmith/DETAILS b/kde-gear/keysmith/DETAILS
index 5b92e9b..0e76ed3 100755
--- a/kde-gear/keysmith/DETAILS
+++ b/kde-gear/keysmith/DETAILS
@@ -3,13 +3,13 @@ source $GRIMOIRE/KDE_VERSIONS
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
          SOURCE2=$SOURCE.sig
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$KDE_VERSION/src/$SOURCE
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+        WEB_SITE=https://apps.kde.org
 
-        WEB_SITE=https://invent.kde.org/kde/keysmith
          ENTERED=20191218
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kfind/DETAILS b/kde-gear/kfind/DETAILS
index b8f1f4b..d7260a1 100644
--- a/kde-gear/kfind/DETAILS
+++ b/kde-gear/kfind/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
           SPELL=kfind
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=kfind/.git
+        WEB_SITE=https://apps.kde.org
          ENTERED=20140629
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kfourinline/DETAILS b/kde-gear/kfourinline/DETAILS
index ec2664b..0ea3ebb 100755
--- a/kde-gear/kfourinline/DETAILS
+++ b/kde-gear/kfourinline/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kfourinline
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/games/kfourinline
+        WEB_SITE=https://apps.kde.org
          ENTERED=20150412
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kgeography/DETAILS b/kde-gear/kgeography/DETAILS
index efbb9c2..a4c8de5 100755
--- a/kde-gear/kgeography/DETAILS
+++ b/kde-gear/kgeography/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kgeography
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects/kgeography
+        WEB_SITE=https://apps.kde.org
          ENTERED=20150426
       LICENSE[0]=GPL
         KEYWORDS="kde5"
diff --git a/kde-gear/kget/DETAILS b/kde-gear/kget/DETAILS
index 10f4626..80c67b5 100755
--- a/kde-gear/kget/DETAILS
+++ b/kde-gear/kget/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kget
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=kget/kget.git
+        WEB_SITE=https://apps.kde.org
          ENTERED=20171110
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kgpg/DETAILS b/kde-gear/kgpg/DETAILS
index b1407ad..dc39e86 100755
--- a/kde-gear/kgpg/DETAILS
+++ b/kde-gear/kgpg/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kgpg
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=kgpg.git
+        WEB_SITE=https://apps.kde.org
        LICENSE[0]=GPL
          ENTERED=2016111
         KEYWORDS="KF5"
diff --git a/kde-gear/khangman/DETAILS b/kde-gear/khangman/DETAILS
index 379763f..97bbbe6 100755
--- a/kde-gear/khangman/DETAILS
+++ b/kde-gear/khangman/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=khangman
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://edu.kde.org/release-service/language/khangman
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110803
       LICENSE[0]=GPL
         KEYWORDS="kde5"
diff --git a/kde-gear/khealthcertificate/DETAILS 
b/kde-gear/khealthcertificate/DETAILS
index 48ebaac..8e44ad4 100755
--- a/kde-gear/khealthcertificate/DETAILS
+++ b/kde-gear/khealthcertificate/DETAILS
@@ -1,13 +1,14 @@
 source $GRIMOIRE/KDE_VERSIONS
            SPELL=khealthcertificate
-         VERSION=23.01.0
+         VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
          SOURCE2=$SOURCE.sig
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/plasma-mobile/$VERSION/$SOURCE
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+        WEB_SITE=https://apps.kde.org
 
          ENTERED=20210801
 #  SECURITY_PATCH=1
diff --git a/kde-gear/khelpcenter/DETAILS b/kde-gear/khelpcenter/DETAILS
index c0652b7..4fb0a7c 100755
--- a/kde-gear/khelpcenter/DETAILS
+++ b/kde-gear/khelpcenter/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=khelpcenter
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects/frameworks/khelpcenter
+        WEB_SITE=https://apps.kde.org
          ENTERED=20140407
 #  SECURITY_PATCH=1
       LICENSE[0]=LGPL
diff --git a/kde-gear/kig/DETAILS b/kde-gear/kig/DETAILS
index a24432d..e4b0c9d 100755
--- a/kde-gear/kig/DETAILS
+++ b/kde-gear/kig/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kig
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://edu.kde.org/release-service/mathematics/kig
+        WEB_SITE=https://apps.kde.org
          ENTERED=20140817
       LICENSE[0]=GPL
         KEYWORDS="kde5"
diff --git a/kde-gear/kigo/DETAILS b/kde-gear/kigo/DETAILS
index 4ff9152..84a12ff 100755
--- a/kde-gear/kigo/DETAILS
+++ b/kde-gear/kigo/DETAILS
@@ -2,15 +2,14 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kigo
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=kigo.git
+        WEB_SITE=https://apps.kde.org
 
-        WEB_SITE=https://www.kde.org/release-service/games/kigo
          ENTERED=20141203
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kimagemapeditor/DETAILS 
b/kde-gear/kimagemapeditor/DETAILS
index a0dd347..47737db 100755
--- a/kde-gear/kimagemapeditor/DETAILS
+++ b/kde-gear/kimagemapeditor/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kimagemapeditor
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/graphics/kimagemapeditor
+        WEB_SITE=https://apps.kde.org
          ENTERED=20180207
       LICENSE[0]=GPL
         KEYWORDS="kde5"
diff --git a/kde-gear/kio-extras/DETAILS b/kde-gear/kio-extras/DETAILS
index 60b1358..15b494f 100755
--- a/kde-gear/kio-extras/DETAILS
+++ b/kde-gear/kio-extras/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kio-extras
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects/frameworks/kio-extras
+        WEB_SITE=https://apps.kde.org
        LICENSE[0]=GPL
          ENTERED=20131101
         KEYWORDS="KF5"
diff --git a/kde-gear/kirigami-gallery/DETAILS 
b/kde-gear/kirigami-gallery/DETAILS
index 8c6667b..47ef995 100755
--- a/kde-gear/kirigami-gallery/DETAILS
+++ b/kde-gear/kirigami-gallery/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kirigami-gallery
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=$SPELL.git
+        WEB_SITE=https://apps.kde.org
          ENTERED=20181121
       LICENSE[0]=GPL
         KEYWORDS="kde5"
diff --git a/kde-gear/kiriki/DETAILS b/kde-gear/kiriki/DETAILS
index d6bdbb4..009dcff 100755
--- a/kde-gear/kiriki/DETAILS
+++ b/kde-gear/kiriki/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kiriki
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/games/kiriki
+        WEB_SITE=https://apps.kde.org
          ENTERED=20151217
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kiten/DETAILS b/kde-gear/kiten/DETAILS
index bf10571..51e37b7 100755
--- a/kde-gear/kiten/DETAILS
+++ b/kde-gear/kiten/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kiten
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://edu.kde.org/release-service/language/kiten
+        WEB_SITE=https://apps.kde.org
          ENTERED=20141119
       LICENSE[0]=GPL
         KEYWORDS="kde5"
diff --git a/kde-gear/klettres/DETAILS b/kde-gear/klettres/DETAILS
index c770103..ef1af82 100755
--- a/kde-gear/klettres/DETAILS
+++ b/kde-gear/klettres/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=klettres
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://edu.kde.org/release-service/language/klettres
+        WEB_SITE=https://apps.kde.org
          ENTERED=20141119
       LICENSE[0]=GPL
         KEYWORDS="kde5"
diff --git a/kde-gear/kmag/DETAILS b/kde-gear/kmag/DETAILS
index b05c658..24bad44 100755
--- a/kde-gear/kmag/DETAILS
+++ b/kde-gear/kmag/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kmag
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=kmag.git
+        WEB_SITE=https://apps.kde.org
       LICENSE[0]="GPL"
          ENTERED=20170706
         KEYWORDS=""
diff --git a/kde-gear/kmahjongg/DETAILS b/kde-gear/kmahjongg/DETAILS
index 0c898ca..3ca0960 100755
--- a/kde-gear/kmahjongg/DETAILS
+++ b/kde-gear/kmahjongg/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kmahjongg
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/games/kmahjongg
+        WEB_SITE=https://apps.kde.org
          ENTERED=20120820
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kmines/DETAILS b/kde-gear/kmines/DETAILS
index b4a6a4a..5ed0c50 100755
--- a/kde-gear/kmines/DETAILS
+++ b/kde-gear/kmines/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kmines
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/games/kmines
+        WEB_SITE=https://apps.kde.org
          ENTERED=20140915
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kmix/DETAILS b/kde-gear/kmix/DETAILS
index 3a3cfdc..01972c7 100755
--- a/kde-gear/kmix/DETAILS
+++ b/kde-gear/kmix/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kmix
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//kmix
+        WEB_SITE=https://apps.kde.org
          ENTERED=2012-03-30
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kmousetool/DETAILS b/kde-gear/kmousetool/DETAILS
index e6a7b18..1de905c 100644
--- a/kde-gear/kmousetool/DETAILS
+++ b/kde-gear/kmousetool/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
           SPELL=kmousetool
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=kmousetool.git
+        WEB_SITE=https://apps.kde.org
 
          ENTERED=20140629
 #  SECURITY_PATCH=1
diff --git a/kde-gear/kmouth/DETAILS b/kde-gear/kmouth/DETAILS
index 3877eed..80de59f 100755
--- a/kde-gear/kmouth/DETAILS
+++ b/kde-gear/kmouth/DETAILS
@@ -1,11 +1,14 @@
 source $GRIMOIRE/KDE_VERSIONS
            SPELL=kmouth
          VERSION=$KDE_VERSION
-     SOURCE_HASH=sha512:
-          SOURCE="${SPELL}-${VERSION}.tar.xz"
-   
SOURCE_URL[0]=https://download.kde.org/$KDE_BRANCH/${VERSION}/src/${SOURCE}
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
-        WEB_SITE="www.kde.org"
+          SOURCE=$SPELL-$VERSION.tar.xz
+         SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
+  SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+      SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+        WEB_SITE=https://apps.kde.org
       LICENSE[0]="GPL"
          ENTERED=20170924
         KEYWORDS=""
diff --git a/kde-gear/kmplot/DETAILS b/kde-gear/kmplot/DETAILS
index c6d6ebc..5965e43 100755
--- a/kde-gear/kmplot/DETAILS
+++ b/kde-gear/kmplot/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kmplot
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://edu.kde.org/release-service/mathematics/kmplot
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110218
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/knavalbattle/DETAILS b/kde-gear/knavalbattle/DETAILS
index 1050b8f..919a2b9 100755
--- a/kde-gear/knavalbattle/DETAILS
+++ b/kde-gear/knavalbattle/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=knavalbattle
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/games/knavalbattle
+        WEB_SITE=https://apps.kde.org
          ENTERED=20140915
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/koko/DETAILS b/kde-gear/koko/DETAILS
index 9f45695..2b1fda2 100755
--- a/kde-gear/koko/DETAILS
+++ b/kde-gear/koko/DETAILS
@@ -3,13 +3,13 @@ source $GRIMOIRE/KDE_VERSIONS
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
          SOURCE2=$SOURCE.sig
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$KDE_VERSION/src/$SOURCE
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+        WEB_SITE=https://apps.kde.org
 
-        WEB_SITE=https://cgi.kde.org/koko.git/about
          ENTERED=20150317
 #  SECURITY_PATCH=1
       LICENSE[0]=CCO
diff --git a/kde-gear/kollision/DETAILS b/kde-gear/kollision/DETAILS
index 97eeffa..4f31ed1 100755
--- a/kde-gear/kollision/DETAILS
+++ b/kde-gear/kollision/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kollision
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/games/kollision
+        WEB_SITE=https://apps.kde.org
          ENTERED=20160728
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kolourpaint/DETAILS b/kde-gear/kolourpaint/DETAILS
index 69741ef..b427a25 100755
--- a/kde-gear/kolourpaint/DETAILS
+++ b/kde-gear/kolourpaint/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kolourpaint
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/graphics/kolourpaint
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110225
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kompare/DETAILS b/kde-gear/kompare/DETAILS
index b9d42c3..eb44302 100755
--- a/kde-gear/kompare/DETAILS
+++ b/kde-gear/kompare/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kompare
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//kompare
+        WEB_SITE=https://apps.kde.org
       LICENSE[0]=LGPL
          ENTERED=20141017
         KEYWORDS="kde5"
diff --git a/kde-gear/konqueror/DETAILS b/kde-gear/konqueror/DETAILS
index 1129a26..1e5732f 100644
--- a/kde-gear/konqueror/DETAILS
+++ b/kde-gear/konqueror/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
           SPELL=konqueror
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=konqueror/.git
+        WEB_SITE=https://apps.kde.org
          ENTERED=20140629
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/konsole/DETAILS b/kde-gear/konsole/DETAILS
index dab88c8..ec4358b 100755
--- a/kde-gear/konsole/DETAILS
+++ b/kde-gear/konsole/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=konsole
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/system/konsole
+        WEB_SITE=https://apps.kde.org
        LICENSE[0]=GPL
          ENTERED=20131212
         KEYWORDS="KF5"
diff --git a/kde-gear/konversation/DETAILS b/kde-gear/konversation/DETAILS
index b7a99f3..d883b94 100755
--- a/kde-gear/konversation/DETAILS
+++ b/kde-gear/konversation/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=konversation
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   
SOURCE_URL[0]=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
-        WEB_SITE=https://konversation.kde.org
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+        WEB_SITE=https://apps.kde.org
          ENTERED=20040918
       LICENSE[0]=GPL
         KEYWORDS="irc kde5"
diff --git a/kde-gear/kopeninghours/DETAILS b/kde-gear/kopeninghours/DETAILS
index 2ecc710..f800616 100755
--- a/kde-gear/kopeninghours/DETAILS
+++ b/kde-gear/kopeninghours/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kopeninghours
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://cgi.kde.org/kopeninghours.git/about
+        WEB_SITE=https://apps.kde.org
          ENTERED=20201121
       LICENSE[0]=GPL
         KEYWORDS="kf5"
diff --git a/kde-gear/kopete/DETAILS b/kde-gear/kopete/DETAILS
index 8ee2999..82113f7 100755
--- a/kde-gear/kopete/DETAILS
+++ b/kde-gear/kopete/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
           SPELL=kopete
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://cgit.kde.org/kopete.git
+        WEB_SITE=https://apps.kde.org
          ENTERED=20180412
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kpat/DETAILS b/kde-gear/kpat/DETAILS
index 15a400a..f2c7b00 100755
--- a/kde-gear/kpat/DETAILS
+++ b/kde-gear/kpat/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kpat
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/games/kpat
+        WEB_SITE=https://apps.kde.org
          ENTERED=2015014
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kpmcore/DETAILS b/kde-gear/kpmcore/DETAILS
index da8dca6..ce631f1 100755
--- a/kde-gear/kpmcore/DETAILS
+++ b/kde-gear/kpmcore/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kpmcore
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/20.12.0/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//kpmcore
+        WEB_SITE=https://apps.kde.org
       LICENSE[0]=LGPL
          ENTERED=20150611
         KEYWORDS="kde5 disk"
diff --git a/kde-gear/kqtquickcharts/DETAILS b/kde-gear/kqtquickcharts/DETAILS
index 1394612..9f98be8 100755
--- a/kde-gear/kqtquickcharts/DETAILS
+++ b/kde-gear/kqtquickcharts/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kqtquickcharts
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=kqtquickcharts/.git
+        WEB_SITE=https://apps.kde.org
          ENTERED=20140830
       LICENSE[0]=GPL
         KEYWORDS="kde5"
diff --git a/kde-gear/kreversi/DETAILS b/kde-gear/kreversi/DETAILS
index ef5f9bf..82c7cfb 100755
--- a/kde-gear/kreversi/DETAILS
+++ b/kde-gear/kreversi/DETAILS
@@ -2,15 +2,14 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kreversi
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=kreversi.git
+        WEB_SITE=https://apps.kde.org
 
-        WEB_SITE=https://www.kde.org/release-service/games/kreversi/
          ENTERED=20120820
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kruler/DETAILS b/kde-gear/kruler/DETAILS
index 9efcb23..a93ad5c 100755
--- a/kde-gear/kruler/DETAILS
+++ b/kde-gear/kruler/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kruler
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/graphics/kruler
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110804
       LICENSE[0]=GPL
         KEYWORDS="kde5"
diff --git a/kde-gear/ksanecore/DETAILS b/kde-gear/ksanecore/DETAILS
index 20bf549..f9353b0 100755
--- a/kde-gear/ksanecore/DETAILS
+++ b/kde-gear/ksanecore/DETAILS
@@ -2,12 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=ksanecore
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+        WEB_SITE=https://apps.kde.org
          ENTERED=20220506
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kshisen/DETAILS b/kde-gear/kshisen/DETAILS
index e4bb82f..00001fe 100755
--- a/kde-gear/kshisen/DETAILS
+++ b/kde-gear/kshisen/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kshisen
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/games/kshisen
+        WEB_SITE=https://apps.kde.org
          ENTERED=20120820
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/ksudoku/DETAILS b/kde-gear/ksudoku/DETAILS
index 260762b..f06a6c5 100755
--- a/kde-gear/ksudoku/DETAILS
+++ b/kde-gear/ksudoku/DETAILS
@@ -2,15 +2,14 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=ksudoku
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=ksudoku.git
+        WEB_SITE=https://apps.kde.org
 
-        WEB_SITE=https://www.kde.org/release-service/games/ksudoku/
          ENTERED=20120820
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/ktimer/DETAILS b/kde-gear/ktimer/DETAILS
index a654caa..edef19a 100644
--- a/kde-gear/ktimer/DETAILS
+++ b/kde-gear/ktimer/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=ktimer
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/utilities/ktimer
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110821
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/ktorrent/DETAILS b/kde-gear/ktorrent/DETAILS
index 73044db..60a4f95 100755
--- a/kde-gear/ktorrent/DETAILS
+++ b/kde-gear/ktorrent/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=ktorrent
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/20.12.0/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.ktorrent.org
+        WEB_SITE=https://apps.kde.org
          ENTERED=20151128
       LICENSE[0]=GPL
         KEYWORDS="bittorrent kde"
diff --git a/kde-gear/ktouch/DETAILS b/kde-gear/ktouch/DETAILS
index 16ab92c..a47ac42 100755
--- a/kde-gear/ktouch/DETAILS
+++ b/kde-gear/ktouch/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=ktouch
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=ktouch.git
+        WEB_SITE=https://apps.kde.org
          ENTERED=20161013
       LICENSE[0]=GPL
         KEYWORDS="kde5"
diff --git a/kde-gear/ktuberling/DETAILS b/kde-gear/ktuberling/DETAILS
index fcbd13a..df790f5 100755
--- a/kde-gear/ktuberling/DETAILS
+++ b/kde-gear/ktuberling/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=ktuberling
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/games/ktuberling
+        WEB_SITE=https://apps.kde.org
          ENTERED=20151216
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kturtle/DETAILS b/kde-gear/kturtle/DETAILS
index 96b185f..0c5628b 100755
--- a/kde-gear/kturtle/DETAILS
+++ b/kde-gear/kturtle/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kturtle
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//kturtle
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110803
       LICENSE[0]=GPL
         KEYWORDS="kde5"
diff --git a/kde-gear/kubrick/DETAILS b/kde-gear/kubrick/DETAILS
index 40b9da2..6a5976e 100755
--- a/kde-gear/kubrick/DETAILS
+++ b/kde-gear/kubrick/DETAILS
@@ -2,15 +2,14 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kubrick
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=kubrick.git
+        WEB_SITE=https://apps.kde.org
 
-        WEB_SITE=https://www.kde.org/release-service/games/kubrick
          ENTERED=20170603
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kwalletmanager/DETAILS b/kde-gear/kwalletmanager/DETAILS
index 80be23d..86954de 100644
--- a/kde-gear/kwalletmanager/DETAILS
+++ b/kde-gear/kwalletmanager/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kwalletmanager
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/system/kwalletmanager
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110821
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/kwave/DETAILS b/kde-gear/kwave/DETAILS
index 08a15c0..f15ef36 100755
--- a/kde-gear/kwave/DETAILS
+++ b/kde-gear/kwave/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kwave
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=kwave/.git
+        WEB_SITE=https://apps.kde.org
       LICENSE[0]=GPL
          ENTERED=20080125
            SHORT="a sound editor for KDE5"
diff --git a/kde-gear/kweather/DETAILS b/kde-gear/kweather/DETAILS
index 9cadaba..89bd742 100755
--- a/kde-gear/kweather/DETAILS
+++ b/kde-gear/kweather/DETAILS
@@ -3,11 +3,12 @@ source $GRIMOIRE/KDE_VERSIONS
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
          SOURCE2=$SOURCE.sig
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$KDE_VERSION/src/$SOURCE
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+        WEB_SITE=https://apps.kde.org
 
          ENTERED=20210801
 #  SECURITY_PATCH=1
diff --git a/kde-gear/kwordquiz/DETAILS b/kde-gear/kwordquiz/DETAILS
index cba2d22..9b8427c 100755
--- a/kde-gear/kwordquiz/DETAILS
+++ b/kde-gear/kwordquiz/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=kwordquiz
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://edu.kde.org/release-service/language/kwordquiz
+        WEB_SITE=https://apps.kde.org
          ENTERED=20141119
       LICENSE[0]=GPL
         KEYWORDS="kde5"
diff --git a/kde-gear/libkcddb/DETAILS b/kde-gear/libkcddb/DETAILS
index 1c879c8..91a9df9 100755
--- a/kde-gear/libkcddb/DETAILS
+++ b/kde-gear/libkcddb/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=libkcddb
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=libkcddb.git
+        WEB_SITE=https://apps.kde.org
          ENTERED=2012-03-30
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/libkcompactdisc/DETAILS 
b/kde-gear/libkcompactdisc/DETAILS
index 581f516..b47e21d 100755
--- a/kde-gear/libkcompactdisc/DETAILS
+++ b/kde-gear/libkcompactdisc/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=libkcompactdisc
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=libkcompactdisc.git
+        WEB_SITE=https://apps.kde.org
       LICENSE[0]="GPL"
          ENTERED=20120208
         KEYWORDS=""
diff --git a/kde-gear/libkdcraw/DETAILS b/kde-gear/libkdcraw/DETAILS
index 43c7b8c..bffcd377 100755
--- a/kde-gear/libkdcraw/DETAILS
+++ b/kde-gear/libkdcraw/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=libkdcraw
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//libkdcraw
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110219
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/libkdegames/DETAILS b/kde-gear/libkdegames/DETAILS
index 343b8ef..37fbd02 100755
--- a/kde-gear/libkdegames/DETAILS
+++ b/kde-gear/libkdegames/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=libkdegames
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//libkdegames5
+        WEB_SITE=https://apps.kde.org
          ENTERED=20120820
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/libkeduvocdocument/DETAILS 
b/kde-gear/libkeduvocdocument/DETAILS
index 165f40b..7722295 100644
--- a/kde-gear/libkeduvocdocument/DETAILS
+++ b/kde-gear/libkeduvocdocument/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=libkeduvocdocument
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//libkeduvocdocument
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110211
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/libkexiv2/DETAILS b/kde-gear/libkexiv2/DETAILS
index 12f004b..802c685 100755
--- a/kde-gear/libkexiv2/DETAILS
+++ b/kde-gear/libkexiv2/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=libkexiv2
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//libkexiv2
+        WEB_SITE=https://apps.kde.org
          ENTERED=20020912
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/libkmahjongg/DETAILS b/kde-gear/libkmahjongg/DETAILS
index 5e0fa0b..3f90d14 100755
--- a/kde-gear/libkmahjongg/DETAILS
+++ b/kde-gear/libkmahjongg/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=libkmahjongg
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//libkmahjongg
+        WEB_SITE=https://apps.kde.org
          ENTERED=20120820
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/libkomparediff2/DETAILS 
b/kde-gear/libkomparediff2/DETAILS
index f35c38f..03bc49b 100755
--- a/kde-gear/libkomparediff2/DETAILS
+++ b/kde-gear/libkomparediff2/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=libkomparediff2
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//libkomparediff2
+        WEB_SITE=https://apps.kde.org
       LICENSE[0]=LGPL
          ENTERED=20140503
         KEYWORDS="kde5"
diff --git a/kde-gear/libksane/DETAILS b/kde-gear/libksane/DETAILS
index 269788d..2a05648 100755
--- a/kde-gear/libksane/DETAILS
+++ b/kde-gear/libksane/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=libksane
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//libksane
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110224
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/libktorrent/DETAILS b/kde-gear/libktorrent/DETAILS
index b2275ba..ccab91d 100755
--- a/kde-gear/libktorrent/DETAILS
+++ b/kde-gear/libktorrent/DETAILS
@@ -1,15 +1,15 @@
 source $GRIMOIRE/KDE_VERSIONS
            SPELL=libktorrent
          VERSION=$KDE_VERSION
-              VX=5.2.0
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/20.12.0/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.ktorrent.org
+        WEB_SITE=https://apps.kde.org
+              VX=5.2.0
          ENTERED=20151128
       LICENSE[0]=GPL
         KEYWORDS="bittorrent library"
diff --git a/kde-gear/lokalize/DETAILS b/kde-gear/lokalize/DETAILS
index 8a9fb63..72562fb 100755
--- a/kde-gear/lokalize/DETAILS
+++ b/kde-gear/lokalize/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=lokalize
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//lokalize
+        WEB_SITE=https://apps.kde.org
       LICENSE[0]=GPL
          ENTERED=20141220
         KEYWORDS="kde5"
diff --git a/kde-gear/marble/DETAILS b/kde-gear/marble/DETAILS
index da6b114..7363b33 100755
--- a/kde-gear/marble/DETAILS
+++ b/kde-gear/marble/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=marble
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://marble.kde.org
+        WEB_SITE=https://apps.kde.org
          ENTERED=20150821
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/minuet/DETAILS b/kde-gear/minuet/DETAILS
index 310ef89..47e7cb4 100755
--- a/kde-gear/minuet/DETAILS
+++ b/kde-gear/minuet/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=minuet
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://minuet.kde.org
+        WEB_SITE=https://apps.kde.org
       LICENSE[0]=GPL
          ENTERED=20151107
            SHORT="musical education software"
diff --git a/kde-gear/mobipocket/DETAILS b/kde-gear/mobipocket/DETAILS
index 36fa330..1161996 100755
--- a/kde-gear/mobipocket/DETAILS
+++ b/kde-gear/mobipocket/DETAILS
@@ -1,15 +1,14 @@
 source $GRIMOIRE/KDE_VERSIONS
            SPELL=mobipocket
-          SPELLX=kdegraphics-mobipocket
          VERSION=$KDE_VERSION
-          SOURCE=$SPELLX-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
+          SOURCE=$SPELL-$VERSION.tar.xz
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
-        WEB_SITE=https://cgit.kde.org/kdegraphics-mobipocket.git
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+        WEB_SITE=https://apps.kde.org
          ENTERED=20161031
       LICENSE[0]=GPL
         KEYWORDS="kde5"
diff --git a/kde-gear/neochat/DETAILS b/kde-gear/neochat/DETAILS
index 7727669..d5620e7 100755
--- a/kde-gear/neochat/DETAILS
+++ b/kde-gear/neochat/DETAILS
@@ -3,13 +3,13 @@ source $GRIMOIRE/KDE_VERSIONS
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
          SOURCE2=$SOURCE.sig
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$KDE_VERSION/src/$SOURCE
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+        WEB_SITE=https://apps.kde.org
 
-        WEB_SITE=
          ENTERED=20201223
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/okular/DETAILS b/kde-gear/okular/DETAILS
index 82ae77d..90a6b70 100755
--- a/kde-gear/okular/DETAILS
+++ b/kde-gear/okular/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=okular
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=okular/.git
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110301
   SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/palapeli/DETAILS b/kde-gear/palapeli/DETAILS
index 2a9dea4..c7f61dd 100755
--- a/kde-gear/palapeli/DETAILS
+++ b/kde-gear/palapeli/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=palapeli
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=palapeli/.git
+        WEB_SITE=https://apps.kde.org
          ENTERED=2015015
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/parley/DETAILS b/kde-gear/parley/DETAILS
index 423f29b..63ffe3a 100755
--- a/kde-gear/parley/DETAILS
+++ b/kde-gear/parley/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=parley
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://edu.kde.org/release-service/language/parley
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110803
       LICENSE[0]=GPL
         KEYWORDS="kde5"
diff --git a/kde-gear/partitionmanager/DETAILS 
b/kde-gear/partitionmanager/DETAILS
index 4ea4656..b1c1fc6 100755
--- a/kde-gear/partitionmanager/DETAILS
+++ b/kde-gear/partitionmanager/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=partitionmanager
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION}
-   
SOURCE_URL[0]=https://download.kde.org/$KDE_BRANCH/$SPELL/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
-        
WEB_SITE=https://www.kde.org/release-service/system/kdepartitionmanager
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+        WEB_SITE=https://apps.kde.org
       LICENSE[0]=GPL
          ENTERED=20150216
         KEYWORDS="kde5 disk"
diff --git a/kde-gear/print-manager/DETAILS b/kde-gear/print-manager/DETAILS
index 0d3831c..a573404 100755
--- a/kde-gear/print-manager/DETAILS
+++ b/kde-gear/print-manager/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=print-manager
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//print-manager
+        WEB_SITE=https://apps.kde.org
       LICENSE[0]=GPL
          ENTERED=20120222
         KEYWORDS="kde5 printing"
diff --git a/kde-gear/rocs/DETAILS b/kde-gear/rocs/DETAILS
index b75f6d1..bb70b38 100755
--- a/kde-gear/rocs/DETAILS
+++ b/kde-gear/rocs/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=rocs
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://edu.kde.org/release-service/mathematics/rocs
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110218
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/signon-kwallet-extension/DETAILS 
b/kde-gear/signon-kwallet-extension/DETAILS
index 5c0c903..5b74e61 100755
--- a/kde-gear/signon-kwallet-extension/DETAILS
+++ b/kde-gear/signon-kwallet-extension/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=signon-kwallet-extension
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//signon-kwallet-extension
+        WEB_SITE=https://apps.kde.org
          ENTERED=20150201
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/skanlite/DETAILS b/kde-gear/skanlite/DETAILS
index 793d8cc..1808ac7 100755
--- a/kde-gear/skanlite/DETAILS
+++ b/kde-gear/skanlite/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=skanlite
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://www.kde.org/release-service/graphics/skanlite
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110226
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/skanpage/DETAILS b/kde-gear/skanpage/DETAILS
index 1144f7a..a403b94 100755
--- a/kde-gear/skanpage/DETAILS
+++ b/kde-gear/skanpage/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=skanpage
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://invent.kde.org/utilities/skanpage
+        WEB_SITE=https://apps.kde.org
       LICENSE[0]=GPL
          ENTERED=20211102
         KEYWORDS=""
diff --git a/kde-gear/spectacle/DETAILS b/kde-gear/spectacle/DETAILS
index 709a954..b0f9bb7 100755
--- a/kde-gear/spectacle/DETAILS
+++ b/kde-gear/spectacle/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=spectacle
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//spectacle
+        WEB_SITE=https://apps.kde.org
          ENTERED=20151121
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/step/DETAILS b/kde-gear/step/DETAILS
index fc23371..133856d 100755
--- a/kde-gear/step/DETAILS
+++ b/kde-gear/step/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=step
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://projects.kde.org/projects//step
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110218
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL
diff --git a/kde-gear/svgpart/DETAILS b/kde-gear/svgpart/DETAILS
index 8c4d759..9bf3e00 100755
--- a/kde-gear/svgpart/DETAILS
+++ b/kde-gear/svgpart/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=svgpart
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://quickgit.kde.org/?p=svgpart/.git
+        WEB_SITE=https://apps.kde.org
          ENTERED=20110219
       LICENSE[0]=GPL
         KEYWORDS="kde5"
diff --git a/kde-gear/sweeper/DETAILS b/kde-gear/sweeper/DETAILS
index a0ee5fb..321c020 100755
--- a/kde-gear/sweeper/DETAILS
+++ b/kde-gear/sweeper/DETAILS
@@ -1,11 +1,14 @@
 source $GRIMOIRE/KDE_VERSIONS
            SPELL=sweeper
          VERSION=$KDE_VERSION
-     SOURCE_HASH=sha512:
-          SOURCE="${SPELL}-${VERSION}.tar.xz"
-   
SOURCE_URL[0]=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/${SOURCE}
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
-        WEB_SITE="https://www.kde.org";
+          SOURCE=$SPELL-$VERSION.tar.xz
+         SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
+  SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+      SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+        WEB_SITE=https://apps.kde.org
       LICENSE[0]="GPL"
          ENTERED=20170924
         KEYWORDS=""
diff --git a/kde-gear/tokodon/DETAILS b/kde-gear/tokodon/DETAILS
index 8787008..5398539 100755
--- a/kde-gear/tokodon/DETAILS
+++ b/kde-gear/tokodon/DETAILS
@@ -3,13 +3,13 @@ source $GRIMOIRE/KDE_VERSIONS
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
          SOURCE2=$SOURCE.sig
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$KDE_VERSION/src/$SOURCE
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+        WEB_SITE=https://apps.kde.org
 
-        WEB_SITE=https://invent.kde.org/network/tokodon
          ENTERED=20230223
 #  SECURITY_PATCH=1 
       LICENSE[0]=GPL3
diff --git a/kde-gear/yakuake/DETAILS b/kde-gear/yakuake/DETAILS
index e1b8b38..9d74d9f 100755
--- a/kde-gear/yakuake/DETAILS
+++ b/kde-gear/yakuake/DETAILS
@@ -1,14 +1,14 @@
 source $GRIMOIRE/KDE_VERSIONS
            SPELL=yakuake
          VERSION=$KDE_VERSION
-          SOURCE=${SPELL}-$VERSION.tar.xz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-$VERSION
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/${VERSION}/src/${SOURCE}
+          SOURCE=$SPELL-$VERSION.tar.xz
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
-        WEB_SITE=https://yakuake.kde.org/
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+        WEB_SITE=https://apps.kde.org
          ENTERED=20170426
          LICENSE=GPL
            SHORT="A dropdown terminal program for kde"
diff --git a/kde-gear/zanshin/DETAILS b/kde-gear/zanshin/DETAILS
index 642350d..277e127 100755
--- a/kde-gear/zanshin/DETAILS
+++ b/kde-gear/zanshin/DETAILS
@@ -2,13 +2,13 @@ source $GRIMOIRE/KDE_VERSIONS
            SPELL=zanshin
          VERSION=$KDE_VERSION
           SOURCE=$SPELL-$VERSION.tar.xz
-      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
          SOURCE2=$SOURCE.sig
+      
SOURCE_URL=https://download.kde.org/$KDE_BRANCH/release-service/$VERSION/src/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=https://cgi.kde.org/..git/about
+        WEB_SITE=https://apps.kde.org
          ENTERED=20160403
 #  SECURITY_PATCH=1
       LICENSE[0]=GPL