diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e4db161533..5afecfc723 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -47,42 +47,46 @@ jobs:
           sudo npm install -g asar # to get pacakges.json from resources/app.asar for electron-builder applications
           # npm install -g @alexlafroscia/yaml-merge # to merge yaml files
       - name: Main test
-        # shell: bash
-        run: |
-          # set -e
-          mkdir $HOME/.icewm/
-          echo "ShowTaskBar = 0" > $HOME/.icewm/preferences
-          echo "TaskBarAutoHide = 1" > $HOME/.icewm/preferences
-          echo "TaskBarShowWorkspaces = 0" > $HOME/.icewm/preferences
-          echo "TaskBarShowAllWindows = 0" > $HOME/.icewm/preferences
-          echo "TaskBarShowClock = 0" > $HOME/.icewm/preferences
-          echo "TaskBarShowMailboxStatus = 0" > $HOME/.icewm/preferences
-          echo "TaskBarShowCPUStatus = 0" > $HOME/.icewm/preferences
-          echo "TaskBarShowWindowListMenu = 0" > $HOME/.icewm/preferences
-          # xpra start :99 # Cannot get screenshots to work
-          Xvfb :99 -screen 0 800x600x24 >/dev/null 2>&1 & # Need to set bit depth, otherwise get some black screenshots
-          # until xset -q; do echo "Waiting for X server to start..."; sleep 1; done # We are not immediately using it anyway
-          # Find out which files in data/ have been changed in the last commit
-          #set -x    # Debug #379
-          FILES=$(git log -1 -p data/ | grep +++ | cut -d '/' -f 2-| sed -e 's|dev/null||g')
-          # Finds wrong files in PRs! # FILES=$(git log -1 --name-status --diff-filter=AR --pretty=format: -- data/ | awk '/^A/ || /^R/ {file=$2} END {print file}') # Most recent addition or renaming within the last commit
-          echo "Last changed files from the FILES variable:"
-          echo "$FILES" ; if [ -z "$FILES" ] ; then echo "Variable FILES is empty." && exit 1 ; fi
-          # Work on these files that have been changed in the last commit
-          if [ -n "$FILES" ]; then
-            for FILE in $FILES; do
-              echo "$FILE"
-              bash -e code/worker.sh $(readlink -f "$FILE") 2>&1 | tee log.txt
-              EXIT_CODE=${PIPESTATUS[0]} # bashism; get the return code of the leftmost element of the pipe
-              if [ $EXIT_CODE -ne 0 ]; then
-                echo "worker.sh exited with a non-zero code: $EXIT_CODE"
-                exit $EXIT_CODE
-              fi
-            done
-          fi
-          # xpra stop :99
-          killall Xvfb
-          # bundle exec jekyll build # https://help.github.com/en/articles/viewing-jekyll-build-error-messages#configuring-a-third-party-service-to-display-jekyll-build-error-messages
+        uses: nick-fields/retry@v3
+        with:
+          max_attempts: 10
+          timeout_minutes: 1
+          retry_wait_seconds: 60
+          command: |
+            # set -e
+            mkdir $HOME/.icewm/
+            echo "ShowTaskBar = 0" > $HOME/.icewm/preferences
+            echo "TaskBarAutoHide = 1" > $HOME/.icewm/preferences
+            echo "TaskBarShowWorkspaces = 0" > $HOME/.icewm/preferences
+            echo "TaskBarShowAllWindows = 0" > $HOME/.icewm/preferences
+            echo "TaskBarShowClock = 0" > $HOME/.icewm/preferences
+            echo "TaskBarShowMailboxStatus = 0" > $HOME/.icewm/preferences
+            echo "TaskBarShowCPUStatus = 0" > $HOME/.icewm/preferences
+            echo "TaskBarShowWindowListMenu = 0" > $HOME/.icewm/preferences
+            # xpra start :99 # Cannot get screenshots to work
+            Xvfb :99 -screen 0 800x600x24 >/dev/null 2>&1 & # Need to set bit depth, otherwise get some black screenshots
+            # until xset -q; do echo "Waiting for X server to start..."; sleep 1; done # We are not immediately using it anyway
+            # Find out which files in data/ have been changed in the last commit
+            #set -x    # Debug #379
+            FILES=$(git log -1 -p data/ | grep +++ | cut -d '/' -f 2-| sed -e 's|dev/null||g')
+            # Finds wrong files in PRs! # FILES=$(git log -1 --name-status --diff-filter=AR --pretty=format: -- data/ | awk '/^A/ || /^R/ {file=$2} END {print file}') # Most recent addition or renaming within the last commit
+            echo "Last changed files from the FILES variable:"
+            echo "$FILES" ; if [ -z "$FILES" ] ; then echo "Variable FILES is empty." && exit 1 ; fi
+            # Work on these files that have been changed in the last commit
+            if [ -n "$FILES" ]; then
+              for FILE in $FILES; do
+                echo "$FILE"
+                bash -e code/worker.sh $(readlink -f "$FILE") 2>&1 | tee log.txt
+                EXIT_CODE=${PIPESTATUS[0]} # bashism; get the return code of the leftmost element of the pipe
+                if [ $EXIT_CODE -ne 0 ]; then
+                  echo "worker.sh exited with a non-zero code: $EXIT_CODE"
+                  exit $EXIT_CODE
+                fi
+              done
+            fi
+            # xpra stop :99
+            killall Xvfb
+            # bundle exec jekyll build # https://help.github.com/en/articles/viewing-jekyll-build-error-messages#configuring-a-third-party-service-to-display-jekyll-build-error-messages
       - name: Check log
         if: github.event_name == 'pull_request' && github.event.pull_request.user.login == 'probonopd'
         shell: bash
diff --git a/data/CPU-X b/data/CPU-X
index a3180ea776..9202bbda99 100644
--- a/data/CPU-X
+++ b/data/CPU-X
@@ -1,2 +1,2 @@
-https://github.com/X0rg/CPU-X
+https://github.com/TheTumultuousUnicornOfDarkness/CPU-X
 #