diff --git a/fragments/labels/jetbrainsclion.sh b/fragments/labels/jetbrainsclion.sh
new file mode 100644
index 0000000..8acbd1e
--- /dev/null
+++ b/fragments/labels/jetbrainsclion.sh
@@ -0,0 +1,12 @@
+jetbrainsclion)
+    name="CLion"
+    type="dmg"
+    jetbrainscode="CL"
+    jetbrainsdistribution="mac"
+    if [[ $(arch) == arm64 ]]; then
+        jetbrainsdistribution="macM1"
+    fi
+    downloadURL="https://download.jetbrains.com/product?code=${jetbrainscode}&latest&distribution=${jetbrainsdistribution}"
+    appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "location" | tail -1 | sed -E 's/.*\/[a-zA-Z-]*-([0-9.]*).*[-.].*dmg/\1/g' )
+    expectedTeamID="2ZEFAR8TH3"
+    ;;
\ No newline at end of file
diff --git a/fragments/labels/jetbrainsdatagrip.sh b/fragments/labels/jetbrainsdatagrip.sh
index 87a77f3..5dcf642 100644
--- a/fragments/labels/jetbrainsdatagrip.sh
+++ b/fragments/labels/jetbrainsdatagrip.sh
@@ -1,11 +1,13 @@
 jetbrainsdatagrip)
     name="DataGrip"
     type="dmg"
-    appNewVersion=$(curl -fs "https://data.services.jetbrains.com/products/releases?code=DG&latest=true&type=release" | grep -o 'version*.*,' | cut -d '"' -f3)
-    if [[ $(arch) == "arm64" ]]; then
-        downloadURL=$(curl -fs "https://data.services.jetbrains.com/products/releases?code=DG&latest=true&type=release" | grep -o 'macM1*.*,' | cut -d '"' -f5)
-    elif [[ $(arch) == "i386" ]]; then
-        downloadURL=$(curl -fs "https://data.services.jetbrains.com/products/releases?code=DG&latest=true&type=release" | grep -o 'mac*.*,' | cut -d '"' -f5)
+    jetbrainscode="DG"
+    if [[ $(arch) == i386 ]]; then
+        jetbrainsdistribution="mac"
+    elif [[ $(arch) == arm64 ]]; then
+        jetbrainsdistribution="macM1"
     fi
+    downloadURL="https://download.jetbrains.com/product?code=${jetbrainscode}&latest&distribution=${jetbrainsdistribution}"
+    appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "location" | tail -1 | sed -E 's/.*\/[a-zA-Z-]*-([0-9.]*).*[-.].*dmg/\1/g' )
     expectedTeamID="2ZEFAR8TH3"
     ;;
\ No newline at end of file
diff --git a/fragments/labels/jetbrainsintellijidea.sh b/fragments/labels/jetbrainsintellijidea.sh
index 233eda9..51cd19f 100644
--- a/fragments/labels/jetbrainsintellijidea.sh
+++ b/fragments/labels/jetbrainsintellijidea.sh
@@ -1,7 +1,13 @@
 jetbrainsintellijidea)
     name="IntelliJ IDEA"
     type="dmg"
-    downloadURL="https://download.jetbrains.com/product?code=II&latest&distribution=mac"
+    jetbrainscode="II"
+    if [[ $(arch) == i386 ]]; then
+        jetbrainsdistribution="mac"
+    elif [[ $(arch) == arm64 ]]; then
+        jetbrainsdistribution="macM1"
+    fi
+    downloadURL="https://download.jetbrains.com/product?code=${jetbrainscode}&latest&distribution=${jetbrainsdistribution}"
     appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "location" | tail -1 | sed -E 's/.*\/[a-zA-Z-]*-([0-9.]*).*[-.].*dmg/\1/g' )
     expectedTeamID="2ZEFAR8TH3"
     ;;
\ No newline at end of file
diff --git a/fragments/labels/jetbrainsintellijideace.sh b/fragments/labels/jetbrainsintellijideace.sh
index 7675050..2b1b8e4 100644
--- a/fragments/labels/jetbrainsintellijideace.sh
+++ b/fragments/labels/jetbrainsintellijideace.sh
@@ -2,7 +2,13 @@ jetbrainsintellijideace|\
 intellijideace)
     name="IntelliJ IDEA CE"
     type="dmg"
-    downloadURL="https://download.jetbrains.com/product?code=IIC&latest&distribution=mac"
+    jetbrainscode="IIC"
+    if [[ $(arch) == i386 ]]; then
+        jetbrainsdistribution="mac"
+    elif [[ $(arch) == arm64 ]]; then
+        jetbrainsdistribution="macM1"
+    fi
+    downloadURL="https://download.jetbrains.com/product?code=${jetbrainscode}&latest&distribution=${jetbrainsdistribution}"
     appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "location" | tail -1 | sed -E 's/.*\/[a-zA-Z-]*-([0-9.]*).*[-.].*dmg/\1/g' )
     expectedTeamID="2ZEFAR8TH3"
     ;;
\ No newline at end of file
diff --git a/fragments/labels/jetbrainsphpstorm.sh b/fragments/labels/jetbrainsphpstorm.sh
index 98e7773..541246c 100644
--- a/fragments/labels/jetbrainsphpstorm.sh
+++ b/fragments/labels/jetbrainsphpstorm.sh
@@ -1,7 +1,13 @@
 jetbrainsphpstorm)
     name="PHPStorm"
     type="dmg"
-    downloadURL="https://download.jetbrains.com/product?code=PS&latest&distribution=mac"
+    jetbrainscode="PS"
+    if [[ $(arch) == i386 ]]; then
+        jetbrainsdistribution="mac"
+    elif [[ $(arch) == arm64 ]]; then
+        jetbrainsdistribution="macM1"
+    fi
+    downloadURL="https://download.jetbrains.com/product?code=${jetbrainscode}&latest&distribution=${jetbrainsdistribution}"
     appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "location" | tail -1 | sed -E 's/.*\/[a-zA-Z-]*-([0-9.]*).*[-.].*dmg/\1/g' )
     expectedTeamID="2ZEFAR8TH3"
     ;;
\ No newline at end of file
diff --git a/fragments/labels/jetbrainspycharm.sh b/fragments/labels/jetbrainspycharm.sh
index 18670a1..10535ff 100644
--- a/fragments/labels/jetbrainspycharm.sh
+++ b/fragments/labels/jetbrainspycharm.sh
@@ -2,11 +2,12 @@ jetbrainspycharm)
     # This is the Pro version of PyCharm. Do not confuse with PyCharm CE.
     name="PyCharm"
     type="dmg"
-    if [[ $(arch) == i386 ]]; then
-        downloadURL="https://download.jetbrains.com/product?code=PCP&latest&distribution=mac"
-    elif [[ $(arch) == arm64 ]]; then
-        downloadURL="https://download.jetbrains.com/product?code=PCP&latest&distribution=macM1"
+    jetbrainscode="PCP"
+    jetbrainsdistribution="mac"
+    if [[ $(arch) == arm64 ]]; then
+        jetbrainsdistribution="macM1"
     fi
+    downloadURL="https://download.jetbrains.com/product?code=${jetbrainscode}&latest&distribution=${jetbrainsdistribution}"
     appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "location" | tail -1 | sed -E 's/.*\/[a-zA-Z-]*-([0-9.]*).*[-.].*dmg/\1/g' )
     expectedTeamID="2ZEFAR8TH3"
     ;;
\ No newline at end of file
diff --git a/fragments/labels/jetbrainspycharmce.sh b/fragments/labels/jetbrainspycharmce.sh
index 8d738a1..646539b 100644
--- a/fragments/labels/jetbrainspycharmce.sh
+++ b/fragments/labels/jetbrainspycharmce.sh
@@ -2,11 +2,12 @@ jetbrainspycharmce|\
 pycharmce)
     name="PyCharm CE"
     type="dmg"
-    if [[ $(arch) == i386 ]]; then
-        downloadURL="https://download.jetbrains.com/product?code=PCC&latest&distribution=mac"
-    elif [[ $(arch) == arm64 ]]; then
-        downloadURL="https://download.jetbrains.com/product?code=PCC&latest&distribution=macM1"
+    jetbrainscode="PCC"
+    jetbrainsdistribution="mac"
+    if [[ $(arch) == arm64 ]]; then
+        jetbrainsdistribution="macM1"
     fi
+    downloadURL="https://download.jetbrains.com/product?code=${jetbrainscode}&latest&distribution=${jetbrainsdistribution}"
     appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "location" | tail -1 | sed -E 's/.*\/[a-zA-Z-]*-([0-9.]*).*[-.].*dmg/\1/g' )
     expectedTeamID="2ZEFAR8TH3"
     ;;
\ No newline at end of file
diff --git a/fragments/labels/jetbrainstoolbox.sh b/fragments/labels/jetbrainstoolbox.sh
index 16bef78..49e5046 100644
--- a/fragments/labels/jetbrainstoolbox.sh
+++ b/fragments/labels/jetbrainstoolbox.sh
@@ -1,11 +1,12 @@
 jetbrainstoolbox)
     name="JetBrains Toolbox"
     type="dmg"
-    if [[ $(arch) == i386 ]]; then
-        downloadURL="https://download.jetbrains.com/product?code=TB&latest&distribution=mac"
-    elif [[ $(arch) == arm64 ]]; then
-        downloadURL="https://download.jetbrains.com/product?code=TB&latest&distribution=macM1"
+    jetbrainscode="TBA"
+    jetbrainsdistribution="mac"
+    if [[ $(arch) == arm64 ]]; then
+        jetbrainsdistribution="macM1"
     fi
+    downloadURL="https://download.jetbrains.com/product?code=${jetbrainscode}&latest&distribution=${jetbrainsdistribution}"
     appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "location" | tail -1 | sed -E 's/.*\/[a-zA-Z-]*-([0-9.]*).*[-.].*dmg/\1/g' )
     expectedTeamID="2ZEFAR8TH3"
     ;;
\ No newline at end of file
diff --git a/fragments/labels/jetbrainswebstorm.sh b/fragments/labels/jetbrainswebstorm.sh
new file mode 100644
index 0000000..65bb473
--- /dev/null
+++ b/fragments/labels/jetbrainswebstorm.sh
@@ -0,0 +1,12 @@
+jetbrainswebstorm)
+    name="Webstorm"
+    type="dmg"
+    jetbrainscode="WS"
+    jetbrainsdistribution="mac"
+    if [[ $(arch) == arm64 ]]; then
+        jetbrainsdistribution="macM1"
+    fi
+    downloadURL="https://download.jetbrains.com/product?code=${jetbrainscode}&latest&distribution=${jetbrainsdistribution}"
+    appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "location" | tail -1 | sed -E 's/.*\/[a-zA-Z-]*-([0-9.]*).*[-.].*dmg/\1/g' )
+    expectedTeamID="2ZEFAR8TH3"
+    ;;
\ No newline at end of file